diff --git a/includes/PasswordPolicy.inc b/includes/PasswordPolicy.inc
index 6e9e0a2..10b9cf6 100644
--- a/includes/PasswordPolicy.inc
+++ b/includes/PasswordPolicy.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains PasswordPolicy.
@@ -134,7 +135,7 @@ class PasswordPolicy {
   public function activeConstraints() {
     $constraints = array();
     foreach ($this->getItems('constraint') as $constraint) {
-      // Any constraint with non-default configuration is "active"
+      // Any constraint with non-default configuration is "active".
       if ($constraint->info['config'] != $constraint->config) {
         $constraints[] = $constraint;
       }
@@ -153,7 +154,7 @@ class PasswordPolicy {
    */
   public function match($account) {
     foreach ($this->getItems('condition') as $condition) {
-      // Any condition with non-default configuration is "active"
+      // Any condition with non-default configuration is "active".
       if ($condition->info['config'] != $condition->config) {
         if (!$condition->match($account)) {
           return FALSE;
diff --git a/includes/PasswordPolicyCondition.inc b/includes/PasswordPolicyCondition.inc
index 04512a3..aa195c1 100644
--- a/includes/PasswordPolicyCondition.inc
+++ b/includes/PasswordPolicyCondition.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains PasswordPolicyCondition.
diff --git a/includes/PasswordPolicyConstraint.inc b/includes/PasswordPolicyConstraint.inc
index 1ddc747..a3fef01 100644
--- a/includes/PasswordPolicyConstraint.inc
+++ b/includes/PasswordPolicyConstraint.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains PasswordPolicyConstraint.
diff --git a/includes/PasswordPolicyItem.inc b/includes/PasswordPolicyItem.inc
index 9c7c657..aca9f1f 100644
--- a/includes/PasswordPolicyItem.inc
+++ b/includes/PasswordPolicyItem.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains PasswordPolicyItem.
diff --git a/password_policy.install b/password_policy.install
index 91562d7..bbcd039 100644
--- a/password_policy.install
+++ b/password_policy.install
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Install functions for Password Policy module.
@@ -25,8 +26,8 @@ function password_policy_schema() {
         'minimum_version' => 1,
         'current_version' => 1,
       ),
-      // If the key is stored in a table that is joined in, specify it:
-      // 'key in table' => 'my_join_table',
+      /* If the key is stored in a table that is joined in, specify it:
+       'key in table' => 'my_join_table',*/
     ),
     'fields' => array(
       'name' => array(
@@ -206,23 +207,23 @@ function password_policy_update_7203() {
     db_add_index('password_policy_history', 'temp', array('pid'));
     db_drop_primary_key('password_policy_history');
     db_change_field('password_policy_history', 'pid', 'hid', array(
-        'description' => 'Primary Key: Unique history ID.',
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      array('primary key' => array('hid'))
+      'description' => 'Primary Key: Unique history ID.',
+      'type' => 'serial',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+    ),
+    array('primary key' => array('hid'))
     );
     db_drop_index('password_policy_history', 'temp');
   }
   db_change_field('password_policy_history', 'pass', 'pass', array(
-      'description' => "User's password (hashed).",
-      'type' => 'varchar',
-      'length' => 128,
-      'not null' => TRUE,
-      'default' => '',
-    ),
-    array()
+    'description' => "User's password (hashed).",
+    'type' => 'varchar',
+    'length' => 128,
+    'not null' => TRUE,
+    'default' => '',
+  ),
+  array()
   );
 }
 
@@ -247,7 +248,7 @@ function password_policy_update_7204(&$sandbox) {
   }
   else {
     require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc');
-    //  Hash again all current hashed passwords.
+    // Hash again all current hashed passwords.
     $has_rows = FALSE;
     // Update this many per page load.
     $count = 1000;
diff --git a/password_policy.module b/password_policy.module
index dce9c38..5c75af3 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Enforces password policies.
@@ -221,12 +222,12 @@ function password_policy_password_element_alter(array &$element, $account) {
   if (count($items)) {
     $element['#description'] = (isset($element['#description']) ? $element['#description'] : '') .
       theme('item_list', array(
-          'items' => $items,
-          'title' => t('Passwords must meet the following requirements:'),
-          'attributes' => array(
-            'id' => 'password-policy-requirements',
-          ),
-        ));
+        'items' => $items,
+        'title' => t('Passwords must meet the following requirements:'),
+        'attributes' => array(
+          'id' => 'password-policy-requirements',
+        ),
+      ));
   }
 
   // Attach password evaluation logic and ensure it's added after user.js.
diff --git a/password_policy.test b/password_policy.test
index 1390179..7426917 100644
--- a/password_policy.test
+++ b/password_policy.test
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Unit tests for Password policy module.
@@ -588,7 +589,7 @@ class PasswordPolicyUITestCase extends DrupalWebTestCase {
     $this->drupalPost("user/$user->uid/edit", $edit, t('Save'));
     $this->assertText('The changes have been saved.');
 
-    // Try to save old $password1;
+    // Try to save old $password1.
     $edit = array();
     $edit['current_pass'] = $password2;
     $edit['pass[pass1]'] = $password1;
diff --git a/password_policy_test/password_policy_test.module b/password_policy_test/password_policy_test.module
index d2691bd..592c28a 100644
--- a/password_policy_test/password_policy_test.module
+++ b/password_policy_test/password_policy_test.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * For testing of module.
+ */
+
+/**
  * Implements hook_ctools_plugin_api().
  */
 function password_policy_test_ctools_plugin_api($module, $api) {
@@ -25,6 +30,9 @@ function password_policy_test_default_password_policy() {
   return $policies;
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
 function password_policy_test_form_user_profile_form_alter(&$form, $form_state) {
   // Remove description so assertText()s can match errors.
   if (variable_get('password_policy_test_no_description', FALSE)) {
diff --git a/plugins/condition/authmap.inc b/plugins/condition/authmap.inc
index 121b97a..d556386 100644
--- a/plugins/condition/authmap.inc
+++ b/plugins/condition/authmap.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Authmap-based condition for Password Policy module.
diff --git a/plugins/condition/role.inc b/plugins/condition/role.inc
index 35c0934..90b8652 100644
--- a/plugins/condition/role.inc
+++ b/plugins/condition/role.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Role-based condition for Password Policy module.
diff --git a/plugins/constraint/alpha_case.inc b/plugins/constraint/alpha_case.inc
index f56c024..f904343 100644
--- a/plugins/constraint/alpha_case.inc
+++ b/plugins/constraint/alpha_case.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Case sensitivity constraint for Password Policy module.
diff --git a/plugins/constraint/alpha_count.inc b/plugins/constraint/alpha_count.inc
index be58ecb..1836757 100644
--- a/plugins/constraint/alpha_count.inc
+++ b/plugins/constraint/alpha_count.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Letter count constraint for Password Policy module.
diff --git a/plugins/constraint/blacklist.inc b/plugins/constraint/blacklist.inc
index 124cd62..7d21460 100644
--- a/plugins/constraint/blacklist.inc
+++ b/plugins/constraint/blacklist.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Blacklist constraint for Password Policy module.
diff --git a/plugins/constraint/char_count.inc b/plugins/constraint/char_count.inc
index a020d35..efdb842 100644
--- a/plugins/constraint/char_count.inc
+++ b/plugins/constraint/char_count.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Character count constraint for Password Policy module.
diff --git a/plugins/constraint/consecutive.inc b/plugins/constraint/consecutive.inc
index 4dbe0dd..3fdee1f 100644
--- a/plugins/constraint/consecutive.inc
+++ b/plugins/constraint/consecutive.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Consecutive character count constraint for Password Policy module.
diff --git a/plugins/constraint/delay.inc b/plugins/constraint/delay.inc
index 41df672..1bb5a9a 100644
--- a/plugins/constraint/delay.inc
+++ b/plugins/constraint/delay.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Delay constraint for Password Policy module.
diff --git a/plugins/constraint/drupal_strength.inc b/plugins/constraint/drupal_strength.inc
index ebc2030..e99ae18 100644
--- a/plugins/constraint/drupal_strength.inc
+++ b/plugins/constraint/drupal_strength.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Drupal strength constraint for Password Policy module.
diff --git a/plugins/constraint/int_count.inc b/plugins/constraint/int_count.inc
index 4848eb3..86338fd 100644
--- a/plugins/constraint/int_count.inc
+++ b/plugins/constraint/int_count.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Numeric count constraint for Password Policy module.
diff --git a/plugins/constraint/past_passwords.inc b/plugins/constraint/past_passwords.inc
index b36f9f3..1f1634b 100644
--- a/plugins/constraint/past_passwords.inc
+++ b/plugins/constraint/past_passwords.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Password history constraint for Password Policy module.
diff --git a/plugins/constraint/symbol_count.inc b/plugins/constraint/symbol_count.inc
index 889c5cb..a177ee2 100644
--- a/plugins/constraint/symbol_count.inc
+++ b/plugins/constraint/symbol_count.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Symbol count constraint for Password Policy module.
diff --git a/plugins/constraint/username.inc b/plugins/constraint/username.inc
index 38c879a..ff9336e 100644
--- a/plugins/constraint/username.inc
+++ b/plugins/constraint/username.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Username constraint for Password Policy module.
diff --git a/plugins/export_ui/password_policy.inc b/plugins/export_ui/password_policy.inc
index d9cacc4..fb5e694 100644
--- a/plugins/export_ui/password_policy.inc
+++ b/plugins/export_ui/password_policy.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Export UI Ctools plugin for Password Policy module.
@@ -9,7 +10,7 @@ $plugin = array(
   // must be an exportable type with the 'export' section defined.
   'schema' => 'password_policy',
   // The access permission to use. If not provided it will default to
-  // 'administer site configuration'
+  // 'administer site configuration'.
   'access' => 'administer password policy',
   // You can actually define large chunks of the menu system here. Nothing
   // is required here. If you leave out the values, the prefix will default
diff --git a/plugins/item/expire.inc b/plugins/item/expire.inc
index db6e4e1..9237cfb 100644
--- a/plugins/item/expire.inc
+++ b/plugins/item/expire.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Expiration plugin for Password Policy module.