diff --git a/remember_me.admin.inc b/remember_me.admin.inc
index 1c482e5..b60cbef 100644
--- a/remember_me.admin.inc
+++ b/remember_me.admin.inc
@@ -68,21 +68,21 @@ function remember_me_admin_settings($form, &$form_state) {
  */
 function theme_remember_me_settings_display($variables) {
   $rows = array(array());
-  
+
   foreach ($variables['vars'] as $var) {
     $element = array(
       'element' => array(
-          '#type' => 'markup',
-          '#children' => $var['#value'],
-          '#title' => $var['#title'],
-          '#title_display' => 'before',
+        '#type' => 'markup',
+        '#children' => $var['#value'],
+        '#title' => $var['#title'],
+        '#title_display' => 'before',
       )
     );
 
     $output = '<div class="container-inline">' . theme('form_element', $element) . '</div>';
     $output .= '<div class="description">' . $var['#description'] . '</div>';
-    
-    $rows[0][] = array( 'data' => $output);
+
+    $rows[0][] = array('data' => $output);
   }
   return theme('table', array('rows' => $rows));
 }
diff --git a/remember_me.install b/remember_me.install
index 8999a8d..1d12811 100644
--- a/remember_me.install
+++ b/remember_me.install
@@ -9,20 +9,21 @@
  * Implements hook_install().
  */
 function remember_me_install() {
-  // Place session management first in the module queue
+  // Place session management first in the module queue.
   db_update('system')
     ->fields(array(
       'weight' =>  -99,
     ))
     ->condition('name', 'remember_me')
-  ->execute();
+    ->execute();
 }
 
 /**
  * Implements hook_disable().
  */
 function remember_me_disable() {
-  // User object data field will have 'remember_me' key forever after you disable the module, lets remove that.
+  // User object data field will have 'remember_me' key forever after you
+  // disable the module, lets remove that.
   $users = user_load_multiple(FALSE);
   foreach ($users as $user) {
     if ($user->uid) {
@@ -37,19 +38,18 @@ function remember_me_disable() {
  * Implements hook_uninstall().
  */
 function remember_me_uninstall() {
-  
   $conf = variable_initialize();
 
-  // Delete all remember_me variables
+  // Delete all remember_me variables.
   foreach ($conf as $key => $value) {
     if (strpos($key, 'remember_me') === 0) {
       variable_del($key);
     }
   }
 
-  // Remove record from system table when uninstalling the module to reset weight
+  // Remove record from system table on uninstall to reset the module weight.
   db_delete('system')
-      ->condition('name', 'remember_me')
+    ->condition('name', 'remember_me')
     ->execute();
 
   drupal_set_message(t('Successfully removed all data for remember_me.'));
diff --git a/remember_me.module b/remember_me.module
index f820bb2..0800966 100644
--- a/remember_me.module
+++ b/remember_me.module
@@ -60,12 +60,12 @@ function remember_me_user_login(&$edit, $account) {
  * Implements hook_user_presave().
  */
 function remember_me_user_presave(&$edit, $account, $category) {
-  // only listen to remember me events
+  // Only listen to remember me events.
   if ($category != 'remember-me') {
     return;
   }
-  
-  // Make sure that our form value 'remember_me' is stored as data 'remember_me'.
+
+  // Ensure that our form value 'remember_me' is stored as data 'remember_me'.
   if (!empty($edit['remember_me'])) {
     if (!isset($edit['data'])) {
       $edit['data'] = array();
@@ -83,7 +83,7 @@ function remember_me_user_presave(&$edit, $account, $category) {
 function remember_me_form_alter(&$form, $form_state, $form_id) {
   // Only make changes to these forms.
   if (in_array($form_id, array('user_login', 'user_login_block'))) {
-    
+
     // Configuration for the remember me checkbox.
     $cbox['remember_me'] = array(
       '#title' => t('Remember me'),
@@ -91,9 +91,9 @@ function remember_me_form_alter(&$form, $form_state, $form_id) {
       '#default_value' => variable_get('remember_me_checkbox', 1),
       '#attributes' => array('tabindex' => 1),
     );
-  
+
     $que = array();
-    
+
     // Now lets try and insert it right after the password field in the document
     // and set the tabindex to 1 for each field so that we can jump in sequence.
     while (list($key, $val) = each($form)) {
@@ -101,14 +101,14 @@ function remember_me_form_alter(&$form, $form_state, $form_id) {
         case 'name':
         case 'pass' :
           $val['#attributes']['tabindex'] = 1;
-        break;
+          break;
         case 'actions':
           $form = $que + $cbox + $form;
           $form[$key]['submit']['#attributes']['tabindex'] = 1;
-        return;
-      }  
+          return;
+      }
       $que[$key] = $val;
-    } 
+    }
   }
 }