diff --git a/pardot.admin-campaign.inc b/pardot.admin-campaign.inc
index ef1d8c1..5308884 100644
--- a/pardot.admin-campaign.inc
+++ b/pardot.admin-campaign.inc
@@ -90,8 +90,6 @@ function pardot_admin_campaign_submit($form, $form_state) {
 /**
  * Theme callback for pardot_admin_campaign.
  *
- * @param array $variables
- *
  * @see pardot_admin_campaign()
  */
 function theme_pardot_admin_campaign($variables) {
@@ -104,7 +102,6 @@ function theme_pardot_admin_campaign($variables) {
       $row[] = drupal_render($form['campaigns'][$id]['name']);
       $row[] = drupal_render($form['campaigns'][$id]['paths']);
 
-
       $ops = array();
       $ops[] = l(t('Edit'), 'admin/config/services/pardot/campaign/' . $form['campaigns'][$id]['#campaign']->campaign_id . '/edit');
       $ops[] = l(t('Delete'), 'admin/config/services/pardot/campaign/' . $form['campaigns'][$id]['#campaign']->campaign_id . '/delete');
diff --git a/pardot.admin-scoring.inc b/pardot.admin-scoring.inc
index 3e5ebee..4434e21 100644
--- a/pardot.admin-scoring.inc
+++ b/pardot.admin-scoring.inc
@@ -81,8 +81,6 @@ function pardot_admin_scoring_submit($form, $form_state) {
 /**
  * Theme callback for pardot_admin_scoring.
  *
- * @param array $variables
- *
  * @see pardot_admin_scoring()
  */
 function theme_pardot_admin_scoring($variables) {
@@ -119,7 +117,7 @@ function theme_pardot_admin_scoring($variables) {
 /**
  * Form constructor for editing scoring entries.
  *
- * @param stdClass $score
+ * @param object $score
  *   Scoring database object.
  *
  * @see pardot_admin_scoring_edit_validate()
@@ -183,7 +181,7 @@ function pardot_admin_scoring_edit_submit($form, &$form_state) {
 /**
  * Form constructor for deleting scoring entries.
  *
- * @param stdClass $score
+ * @param object $score
  *   Scoring database object.
  *
  * @see pardot_admin_scoring_delete_submit()
diff --git a/pardot.admin.inc b/pardot.admin.inc
index 84b5d73..7f3b56d 100644
--- a/pardot.admin.inc
+++ b/pardot.admin.inc
@@ -30,7 +30,8 @@ function pardot_admin_form() {
     '#description' => t('Validate Pardot form handler URL during webform creation.'),
     '#default_value' => variable_get('pardot_validate_url', 1),
   );
-  // If curl isn't available want them that this functionality isn't available and mark it as disabled.
+  // If curl isn't available want them that this functionality isn't available
+  // and mark it as disabled.
   if (!function_exists('curl_getinfo')) {
     $form['pardot']['pardot_validate_url']['#description'] .= '<p class="warning">' .
       t('<a href="@curl">Curl</a> library required for this functionality not found.', array(
@@ -69,7 +70,11 @@ function pardot_admin_form() {
       t('Every page except the listed pages'),
       t('The listed pages only'),
     );
-    $description = t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>'));
+    $description = t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array(
+      '%blog' => 'blog',
+      '%blog-wildcard' => 'blog/*',
+      '%front' => '<front>',
+    ));
 
     if (module_exists('php') && $php_access) {
       $options[] = t('Pages on which this PHP code returns <code>TRUE</code> (experts only)');
@@ -206,11 +211,11 @@ function theme_pardot_webform_components_form($form) {
 
   foreach (element_children($form['components']) as $k) {
     $row = array();
-    // Name
+    // Name.
     $row[] = $form['#node']->webform['components'][$k]['name'];
-    // Type
+    // Type.
     $row[] = $form['#node']->webform['components'][$k]['type'];
-    // Pardot key
+    // Pardot key.
     unset($form['components'][$k]['key']['#title']);
     $row[] = drupal_render($form['components'][$k]['key']);
     $rows[] = $row;
@@ -235,7 +240,7 @@ function pardot_webform_components_form_validate($form, $form_state) {
       // Just check if the URL is active. No validation done if it is not.
       if ($form_state['values']['details']['is_active'] == 1) {
 
-        // If so, check if it's a valid url
+        // If so, check if it's a valid url.
         $check_url = curl_init($form_state['values']['details']['url']);
         // Use curl_setopt to get the response.
         curl_setopt($check_url, CURLOPT_RETURNTRANSFER, TRUE);
diff --git a/pardot.info b/pardot.info
index 636c44d..fe38764 100644
--- a/pardot.info
+++ b/pardot.info
@@ -6,11 +6,4 @@ core = 7.x
 
 dependencies[] = webform
 
-files[] = form-handler-url.jpg
-files[] = pardot-js.tpl.php
-files[] = pardot.admin-campaign.inc
-files[] = pardot.admin-scoring.inc
-files[] = pardot.admin.inc
-files[] = pardot.install
-files[] = pardot.module
 files[] = pardot.test
diff --git a/pardot.install b/pardot.install
index 6575dca..0e86731 100644
--- a/pardot.install
+++ b/pardot.install
@@ -5,7 +5,7 @@
  */
 
 /**
- * Implementation of hook_schema().
+ * Implements hook_schema().
  */
 function pardot_schema() {
   $schema = array();
@@ -22,7 +22,7 @@ function pardot_schema() {
         'not null' => TRUE,
       ),
       'form_nid' => array(
-        // Associated Form Id
+        // Associated form ID.
         'description' => 'Webform nid that generated this post',
         'type' => 'int',
         'size' => 'normal',
@@ -31,7 +31,7 @@ function pardot_schema() {
         'default' => 0,
       ),
       'status' => array(
-        // Form Posted status.
+        // Form posted status.
         'description' => 'Pardot option name',
         'type' => 'varchar',
         'size' => 'normal',
@@ -40,7 +40,7 @@ function pardot_schema() {
         'default' => '',
       ),
       'submitted' => array(
-        // Post Time
+        // Post time.
         'description' => 'Timestamp of form submission',
         'type' => 'int',
         'size' => 'normal',
@@ -49,7 +49,7 @@ function pardot_schema() {
         'default' => 0,
       ),
       'data' => array(
-        // Form Contents
+        // Form contents.
         'description' => 'Form values and other data',
         'type' => 'text',
         'size' => 'normal', /* 16KB in mySql */
@@ -68,8 +68,8 @@ function pardot_schema() {
     ),
     'fields' => array(
       'nid' => array(
-        // Webform Node Id
-        'description' => 'Node Id',
+        // Webform node ID.
+        'description' => 'Node ID',
         'type' => 'int',
         'size' => 'normal',
         'unsigned' => TRUE,
@@ -85,7 +85,7 @@ function pardot_schema() {
         'default' => '',
       ),
       'is_active' => array(
-        // Is this webform Pardot enabled
+        // Is this webform Pardot enabled?
         'description' => 'Whether this form is Pardot active',
         'type' => 'int',
         'size' => 'tiny',
@@ -166,30 +166,24 @@ function pardot_schema() {
 }
 
 /**
- * Implementation of hook_install()
- */
-function pardot_install() {
-
-}
-
-/**
- * Implementation of hook_uninstall()
- */
-function pardot_uninstall() {
-
-}
-
-/**
- * Update Pardot Campaign and Pardot Scoring tables
+ * Update Pardot Campaign and Pardot Scoring tables.
  */
 function pardot_update_7100(&$sandbox) {
 
-  // Change old field (if necessary)
+  // Change old field (if necessary).
   if (!db_field_exists('pardot_submissions', 'form_nid')) {
-    db_change_field('pardot_submissions', 'form_nid_field', 'form_nid', array('description' => 'Webform nid that generated this post', 'type' => 'int', 'size' => 'normal', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0));
+    db_change_field('pardot_submissions', 'form_nid_field', 'form_nid', array(
+      'description' => 'Webform nid that generated this post',
+      'type' => 'int',
+      'size' => 'normal',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+    ));
 
     return t('The Pardot tables were updated.');
   }
-  else
+  else {
     return t('The pardot_submissions field "form_nid" already exists, no change needed.');
+  }
 }
diff --git a/pardot.module b/pardot.module
index 8fe7d09..c2671bb 100644
--- a/pardot.module
+++ b/pardot.module
@@ -54,7 +54,6 @@ function pardot_theme($existing, $type, $theme, $path) {
  * Implements hook_menu().
  */
 function pardot_menu() {
-  $items = array();
   $items['admin/config/services/pardot'] = array(
     'title' => 'Pardot',
     'description' => 'Create and edit Pardot settings.',
@@ -170,6 +169,8 @@ function pardot_help($path, $arg) {
 
 /**
  * Implements hook_form_alter().
+ *
+ * @see pardot_webform_submit()
  */
 function pardot_form_alter(&$form, $form_state, $form_id) {
   if (strpos($form_id, 'webform_client_form') !== 0) {
@@ -199,7 +200,7 @@ function pardot_page_build(&$page) {
   if (isset($_SESSION['pardot_submission'])) {
     $submission = pardot_submission_load($_SESSION['pardot_submission']);
 
-    // Update Post Data
+    // Update post data.
     $submission->status = PARDOT_STATUS_UPLOADED;
 
     pardot_submission_save($submission);
@@ -231,13 +232,13 @@ function pardot_page_build(&$page) {
 }
 
 /**
- * Process pardot_js variables and add settings.
+ * Processes pardot_js() variables and adds settings.
  *
  * @group themeable
  */
 function template_preprocess_pardot_js(&$vars, $row) {
   $vars['pardot_a_id'] = variable_get('pardot_a_id', '');
-  // Compare with the internal and path alias (if any) to find any special campaigns.
+  // Compare with the internal and path alias to find any special campaigns.
   $results = db_query('SELECT campaign_id, paths FROM {pardot_campaign}');
   foreach ($results as $row) {
     $path = drupal_get_path_alias($_GET['q']);
@@ -265,25 +266,29 @@ function template_preprocess_pardot_js(&$vars, $row) {
 }
 
 /**
- * Load a pardot scoring object.
+ * Loads a Pardot scoring object.
  *
  * @param int $scoring_id
+ *   The scoring object ID.
  */
 function pardot_scoring_load($scoring_id) {
   return db_query('SELECT * FROM {pardot_scoring} WHERE scoring_id = :scoring_id', array(':scoring_id' => $scoring_id))->fetchObject();
 }
 
 /**
- * Load a pardot campaign object.
+ * Loads a Pardot campaign object.
  *
- * @param int $campaign_id
+ * @param int $campaign
+ *   The campaign ID.
  */
 function pardot_campaign_load($campaign) {
   return db_query('SELECT * FROM {pardot_campaign} WHERE campaign_id = :campaign_id', array(':campaign_id' => $campaign))->fetchObject();
 }
 
 /**
- * Submit handler added to webforms to store submissions for pardot.
+ * Form submission handler for pardot_form_alter().
+ *
+ * Stores submissions for Pardot.
  */
 function pardot_webform_submit($form, &$form_state) {
   $values = array();
@@ -294,7 +299,7 @@ function pardot_webform_submit($form, &$form_state) {
   // Collapse form values so they make more sense to Pardot.
   $values['post_fields'] = _pardot_form_collapse($form, $form_state);
 
-  // Save the values and essential information to the database
+  // Save the values and essential information to the database.
   $submission = new stdClass();
   $submission->form_nid = $form['#node']->nid;
   $submission->data = $values;
@@ -312,9 +317,10 @@ function pardot_webform_submit($form, &$form_state) {
 }
 
 /**
- * Returns the user headers filtered for types that shouldn't be needed
+ * Returns the user headers filtered for types that shouldn't be needed.
  *
  * @return array
+ *   The filtered user headers.
  */
 function _pardot_get_user_headers() {
   $headers = array();
@@ -324,7 +330,8 @@ function _pardot_get_user_headers() {
     $headers = apache_request_headers();
   }
   else {
-    // Logic judiciously stolen from http://www.php.net/manual/en/function.apache-request-headers.php#72498
+    // Logic judiciously stolen from
+    // @link http://www.php.net/manual/en/function.apache-request-headers.php#72498 @endlink
     foreach ($_SERVER as $k => $v) {
       if (substr($k, 0, 5) == 'HTTP_') {
         $k = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($k, 5)))));
@@ -350,11 +357,12 @@ function _pardot_get_user_headers() {
 }
 
 /**
- * Load a pardot form settings object.
+ * Loads a Pardot form settings object.
  *
- * @param integer $nid
+ * @param int $nid
  *   Associated webform node id.
- * @return
+ *
+ * @return object|FALSE
  *   Settings object or false on failure.
  */
 function pardot_webform_load($nid) {
@@ -389,10 +397,10 @@ function pardot_submission_save($submission) {
 }
 
 /**
- * Load a submission object from the database.
+ * Loads a submission object from the database.
  *
- * @param integer $sid
- *   Submission id.
+ * @param int $sid
+ *   Submission ID.
  */
 function pardot_submission_load($sid) {
   $object = db_query("SELECT * FROM {pardot_submissions} WHERE sid = :sid", array(':sid' => $sid))->fetchObject();
@@ -402,11 +410,11 @@ function pardot_submission_load($sid) {
 }
 
 /**
- * Delete a form submission.
+ * Deletes a form submission.
  *
- * Not sure there is a use case for this but its here for completeness.
+ * Not sure there is a use case for this but it's here for completeness.
  *
- * @param integer $sid
+ * @param int $sid
  *   Submission id.
  */
 function pardot_submission_delete($sid) {
@@ -417,9 +425,6 @@ function pardot_submission_delete($sid) {
 
 /**
  * Collapses a submitted form into a flat array for Pardot.
- *
- * @param array $form
- * @param array $form_state
  */
 function _pardot_form_collapse($form, $form_state) {
   $result = array();
@@ -443,24 +448,24 @@ function _pardot_form_collapse($form, $form_state) {
 /**
  * Helper function to recurse through posted webform.
  *
- * @see _pardot_form_collapse(). *
- * @param $tree
- *   The post tree name => value pairs
- * @param $posted_values
+ * @param array $tree
+ *   The post tree name => value pairs.
+ * @param array $posted_values
  *   The post tree, could be name => value pairs or index => value pairs.
- * @param $form
+ * @param array $form
  *   The actual form structure of the form.
- * @param $result
- *   Return by reference re-structured tree that Pardot will leverage
- * @return none
+ * @param array $result
+ *   Return by reference re-structured tree that Pardot will leverage.
+ *
+ * @see _pardot_form_collapse()
  */
 function _pardot_form_collapse_form($tree, $posted_values, $form, &$result) {
   foreach ($tree as $name => $value) {
-    // we need to expand things in fieldsets
+    // Expand things in fieldsets.
     if (is_array($value) && !in_array($value, $posted_values)) {
       _pardot_form_collapse_form($value, $posted_values, $form[$name], $result);
     }
-    // we need to convert multi-value fields into strings
+    // Convert multi-value fields into strings.
     elseif (is_array($value)) {
       // If it looks like a date, and the year is reasonable then use slashes
       // 0-1-2 = M/D/Y
@@ -473,17 +478,17 @@ function _pardot_form_collapse_form($tree, $posted_values, $form, &$result) {
         $result[$name] = implode(',', $value);
       }
     }
-    // everything else is just passed along
+    // Everything else is just passed along.
     elseif ($form[$name]['#type'] == 'select') {
       // Map select values to text versions. The numeric values won't mean
       // much to Pardot, CRM or any other integration.
       $result[$name] = $form[$name]['#options'][$value];
     }
-    // If this is an address field
-    elseif ( !empty($form[$name]['#addressfield']) ) {
-      if ( $address = unserialize($value) ) {
-        foreach($address as $address_field => $address_field_value) {
-          if ( empty($result[$address_field]) ) {
+    // If this is an address field.
+    elseif (!empty($form[$name]['#addressfield'])) {
+      if ($address = unserialize($value)) {
+        foreach ($address as $address_field => $address_field_value) {
+          if (empty($result[$address_field])) {
             $result[$address_field] = $address_field_value;
           }
         }
@@ -496,9 +501,9 @@ function _pardot_form_collapse_form($tree, $posted_values, $form, &$result) {
 }
 
 /**
- * Load all webform enabled nodes with Pardot post url
+ * Loads all webform enabled nodes with Pardot post URL.
  *
- * @return
+ * @return object|FALSE
  *   Settings object or false on failure.
  */
 function pardot_webform_enabled_pardot_load() {
@@ -519,8 +524,10 @@ function pardot_webform_enabled_pardot_load() {
 }
 
 /**
- * Based on visibility setting this function returns TRUE if GA code should
- * be added to the current page and otherwise FALSE.
+ * Determines if Pardot code should be add for the current page.
+ *
+ * @return bool
+ *   Returns TRUE if GA code should be added to the page, FALSE otherwise.
  */
 function _pardot_visibility_pages() {
   static $page_match;
@@ -538,7 +545,7 @@ function _pardot_visibility_pages() {
       // with different case. Ex: /Page, /page, /PAGE.
       $pages = drupal_strtolower($setting_pages);
       if ($visibility < 2) {
-        // Convert the Drupal path to lowercase
+        // Convert the Drupal path to lowercase.
         $path = drupal_strtolower(drupal_get_path_alias($_GET['q']));
         // Compare the lowercase internal and lowercase path alias (if any).
         $page_match = drupal_match_path($path, $pages);
@@ -565,8 +572,13 @@ function _pardot_visibility_pages() {
 }
 
 /**
- * Based on visibility setting this function returns TRUE if GA code should
- * be added for the current role and otherwise FALSE.
+ * Determines if Pardot code should be add for the given user's role.
+ *
+ * @param array $user
+ *   The given user.
+ *
+ * @return bool
+ *   Returns TRUE if GA code should be added for the role, FALSE otherwise.
  */
 function _pardot_visibility_roles($user) {
 
@@ -579,7 +591,8 @@ function _pardot_visibility_roles($user) {
     foreach (array_keys($user->roles) as $rid) {
       // Is the current user a member of one of these roles?
       if (isset($roles[$rid]) && $rid == $roles[$rid]) {
-        // Current user is a member of a role that should be tracked/excluded from tracking.
+        // Current user is a member of a role that should be tracked/excluded
+        // from tracking.
         $enabled = !$visibility;
         break;
       }
diff --git a/pardot.test b/pardot.test
index 6a0cf25..7e1f8f4 100644
--- a/pardot.test
+++ b/pardot.test
@@ -117,8 +117,7 @@ class PardotFunctionalityTestCase extends DrupalWebTestCase {
     $this->assertRaw('piPoints = "60"', 'Pardot scoring found on scored page after modification.');
 
     // Delete a campaign.
-    $this->drupalPost("admin/config/services/pardot/scoring/1/delete", array(
-      ), t('Delete'));
+    $this->drupalPost("admin/config/services/pardot/scoring/1/delete", array(), t('Delete'));
     $this->drupalGet('user');
     $this->assertNoRaw('piPoints = "', 'Pardot scoring not found on scored page after deletion.');
   }