diff --git a/modules/rdf/rdf.module b/modules/rdf/rdf.module
index e491c31..f4dcb48 100644
--- a/modules/rdf/rdf.module
+++ b/modules/rdf/rdf.module
@@ -91,8 +91,10 @@ function rdf_rdf_namespaces() {
 }
 
 /**
- * Returns an array of RDF namespaces defined in modules that implement
- * hook_rdf_namespaces().
+ * Retrieves RDF namespaces.
+ *
+ * Invokes hook_rdf_namespaces() and collects RDF namespaces from modules that
+ * implement it.
  */
 function rdf_get_namespaces() {
   $rdf_namespaces = module_invoke_all('rdf_namespaces');
@@ -148,7 +150,7 @@ function rdf_mapping_load($type, $bundle = RDF_DEFAULT_BUNDLE) {
  */
 
 /**
- * Helper function to get the default RDF mapping for a given entity type.
+ * Gets the default RDF mapping for a given entity type.
  *
  * @param $type
  *   An entity type, e.g. 'node' or 'comment'.
@@ -179,7 +181,7 @@ function _rdf_get_default_mapping($type) {
 }
 
 /**
- * Helper function to retrieve an RDF mapping from the database.
+ * Retrieves an RDF mapping from the database.
  *
  * @param $type
  *   The entity type the mapping refers to.
@@ -217,10 +219,10 @@ function _rdf_mapping_load($type, $bundle) {
  * keys.
  *
  * @param $mapping
- *   The RDF mapping to save, as an array.
+ *   The RDF mapping to save.
  *
  * @return
- *   Status flag indicating the outcome of the operation.
+ *   MergeQuery object that indicates the outcome of the operation.
  */
 function rdf_mapping_save($mapping) {
   // In the case where a field has a mapping defined in the default entity
@@ -252,7 +254,7 @@ function rdf_mapping_save($mapping) {
  *   The bundle the mapping refers to.
  *
  * @return
- *   Return boolean TRUE if mapping deleted, FALSE if not.
+ *   TRUE if the mapping is deleted, FALSE if not.
  */
 function rdf_mapping_delete($type, $bundle) {
   $num_rows = db_delete('rdf_mapping')
@@ -264,12 +266,12 @@ function rdf_mapping_delete($type, $bundle) {
 }
 
 /**
- * Builds an array of RDFa attributes for a given mapping. This array will
- * typically be passed through drupal_attributes() to create the attributes
- * variables that are available to template files. These include $attributes,
- * $title_attributes, $content_attributes and the field-specific
- * $item_attributes variables. For more information, see
- * theme_rdf_template_variable_wrapper().
+ * Builds an array of RDFa attributes for a given mapping.
+ *
+ * This array will typically be passed through drupal_attributes() to create
+ * the attributes variables that are available to template files. These include
+ * $attributes, $title_attributes, $content_attributes and the field-specific
+ * $item_attributes variables.
  *
  * @param $mapping
  *   An array containing a mandatory 'predicates' key and optional 'datatype',
@@ -283,10 +285,13 @@ function rdf_mapping_delete($type, $bundle) {
  *     );
  *   @endcode
  * @param $data
- *   A value that needs to be converted by the provided callback function.
+ *   (optional) A value that needs to be converted by the provided callback
+ *   function.
  *
  * @return
- *   An array containing RDFa attributes suitable for drupal_attributes().
+ *   RDFa attributes suitable for drupal_attributes().
+ *
+ * @see theme_rdf_template_variable_wrapper()
  */
 function rdf_rdfa_attributes($mapping, $data = NULL) {
   // The type of mapping defaults to 'property'.
@@ -360,10 +365,11 @@ function rdf_modules_uninstalled($modules) {
  * Adds the proper RDF mapping to each entity type/bundle pair.
  *
  * @todo May need to move the comment below to another place.
- * This hook should not be used by modules to alter the bundle mappings.
- * The UI should always be authoritative. UI mappings are stored in the
- * database and if hook_entity_info_alter was used to override module defined
- * mappings, it would override the user defined mapping as well.
+ * This hook should not be used by modules to alter the bundle mappings. The UI
+ * should always be authoritative. UI mappings are stored in the database and
+ * if hook_entity_info_alter() was used to override module defined mappings, it
+ * would override the user defined mapping as well.
+ *
  */
 function rdf_entity_info_alter(&$entity_info) {
   // Loop through each entity type and its bundles.
@@ -425,6 +431,8 @@ function rdf_theme() {
 }
 
 /**
+ * Implements MODULE_process().
+ *
  * Template process function for adding extra tags to hold RDFa attributes.
  *
  * Since template files already have built-in support for $attributes,
@@ -434,9 +442,9 @@ function rdf_theme() {
  * with those here.
  */
 function rdf_process(&$variables, $hook) {
-  // Handles attributes needed for content not covered by title, content,
-  // and field items. It does this by adjusting the variable sent to the
-  // template so that the template doesn't have to worry about it. See
+  // Handles attributes needed for content not covered by title, content, and
+  // field items. It does this by adjusting the variable sent to the template
+  // so that the template doesn't have to worry about it. See
   // theme_rdf_template_variable_wrapper().
   if (!empty($variables['rdf_template_variable_attributes_array'])) {
     foreach ($variables['rdf_template_variable_attributes_array'] as $variable_name => $attributes) {
diff --git a/modules/rdf/rdf.test b/modules/rdf/rdf.test
index b8aeb90..2cf6d65 100644
--- a/modules/rdf/rdf.test
+++ b/modules/rdf/rdf.test
@@ -19,7 +19,7 @@ class RdfMappingHookTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that hook_rdf_mapping() correctly returns and processes mapping.
+   * Tests that hook_rdf_mapping() correctly returns and processes mapping.
    */
   function testMapping() {
     // Test that the mapping is returned correctly by the hook.
@@ -55,7 +55,7 @@ class RdfRdfaMarkupTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test rdf_rdfa_attributes().
+   * Tests rdf_rdfa_attributes().
    */
   function testDrupalRdfaAttributes() {
     // Same value as the one in the HTML tag (no callback function).
@@ -115,6 +115,8 @@ class RdfRdfaMarkupTestCase extends DrupalWebTestCase {
   }
 
   /**
+   * Tests if file fields in teasers have correct resources.
+   * 
    * Ensure that file fields have the correct resource as the object in RDFa
    * when displayed as a teaser.
    */
@@ -222,7 +224,7 @@ class RdfCrudTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test inserting, loading, updating, and deleting RDF mappings.
+   * Tests inserting, loading, updating, and deleting RDF mappings.
    */
   function testCRUD() {
     // Verify loading of a default mapping.
@@ -308,8 +310,10 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
   }
 
   /**
-   * Create a content type and a node of type test_bundle_hook_install and test
-   * whether the RDF mapping defined in rdf_test.install is used.
+   * Tests if RDF mapping defined in rdf_test.install is used.
+   * 
+   * Creates a content type and a node of type test_bundle_hook_install and 
+   * tests whether the RDF mapping defined in rdf_test.install is used.
    */
   function testAttributesInMarkup2() {
     $type = $this->drupalCreateContentType(array('type' => 'test_bundle_hook_install'));
@@ -326,8 +330,10 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
   }
 
   /**
-   * Create a random content type and node and ensure the default mapping for
-   * node is used.
+   * Tests if the default mapping for a node is being used.
+   * 
+   * Creates a random content type and node and ensures the default mapping for
+   * the node is being used.
    */
   function testAttributesInMarkup3() {
     $type = $this->drupalCreateContentType();
@@ -345,7 +351,10 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
   }
 
   /**
-   * Create a random user and ensure the default mapping for user is used.
+   * Tests if default mapping for user is being used.
+   *
+   * Creates a random user and ensures the default mapping for the user is 
+   * being used.
    */
   function testUserAttributesInMarkup() {
     // Create two users, one with access to user profiles.
@@ -469,8 +478,10 @@ class RdfCommentAttributesTestCase extends CommentHelperCase {
   }
 
   /**
-   * Tests the presence of the RDFa markup for the title, date and author and
-   * homepage on registered users and anonymous comments.
+   * Tests if RDFa markup for meta information is present in comments.
+   *
+   * Tests presence of RDFa markup for the title, date and author and homepage
+   * on comments from registered and anonymous users.
    */
   public function testCommentRdfaMarkup() {
 
@@ -521,7 +532,7 @@ class RdfCommentAttributesTestCase extends CommentHelperCase {
   }
 
   /**
-   * Test RDF comment replies.
+   * Tests RDF comment replies.
    */
   public function testCommentReplyOfRdfaMarkup() {
     // Posts comment #1 as a registered user.
@@ -593,7 +604,9 @@ class RdfTrackerAttributesTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Create nodes as both admin and anonymous user and test for correct RDFa
+   * Tests for correct attributes on tracker page.
+   * 
+   * Creates nodes as both admin and anonymous user and tests for correct RDFa
    * markup on the tracker page for those nodes and their comments.
    */
   function testAttributesInTracker() {
@@ -701,7 +714,7 @@ class RdfGetRdfNamespacesTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test getting RDF namesapces.
+   * Tests getting RDF namespaces.
    */
   function testGetRdfNamespaces() {
     // Get all RDF namespaces.
diff --git a/modules/rdf/tests/rdf_test.module b/modules/rdf/tests/rdf_test.module
index c133a33..a504517 100644
--- a/modules/rdf/tests/rdf_test.module
+++ b/modules/rdf/tests/rdf_test.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Test API interaction with the RDF module.
+ * Tests API interaction with the RDF module.
  */
 
 /**