diff --git a/ajax_comments.admin.inc b/ajax_comments.admin.inc
index 04c94e1..ce3f343 100644
--- a/ajax_comments.admin.inc
+++ b/ajax_comments.admin.inc
@@ -9,13 +9,12 @@
  * AJAX comments settings form.
  */
 function ajax_comments_settings() {
-  $options =  node_type_get_names();
   $form['ajax_comments_node_types'] = array(
     '#title' => t('Content types'),
     '#type' => 'checkboxes',
     '#description' => t('Select node types you want to activate ajax comments on. If you select nothing, AJAX Comments will be enabled everywhere.'),
     '#default_value' => variable_get('ajax_comments_node_types', array()),
-    '#options' => $options, 
+    '#options' => node_type_get_names(),
   );
   $form['ajax_comments_notify'] = array(
     '#title' => t('Notification Message'),
diff --git a/ajax_comments.info b/ajax_comments.info
index 0ee03ed..1edb89b 100644
--- a/ajax_comments.info
+++ b/ajax_comments.info
@@ -2,4 +2,3 @@ name = AJAX Comments
 description = Module makes comments load without a page refresh via AJAX
 core = 7.x
 dependencies[] = comment
-
diff --git a/ajax_comments.install b/ajax_comments.install
index e4ac555..97c36d7 100644
--- a/ajax_comments.install
+++ b/ajax_comments.install
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function ajax_comments_uninstall() {
-  variable_del('ajax_comments_node_type');
+  variable_del('ajax_comments_node_types');
+  variable_del('ajax_comments_notify');
 }
-
diff --git a/ajax_comments.module b/ajax_comments.module
index 57a49ff..3432e20 100755
--- a/ajax_comments.module
+++ b/ajax_comments.module
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * Implementation of hook_init().
+ * Implements hook_init().
+ *
  * See README.txt for why this is necessary.
  */
 function ajax_comments_init() {
@@ -10,9 +11,9 @@ function ajax_comments_init() {
   }
 }
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
-function ajax_comments_menu() {  
+function ajax_comments_menu() {
   $items['ajax_comments/reply/%/%'] = array(
     'page callback' => 'ajax_comments_reply',
     'access callback' => 'user_access',
@@ -20,7 +21,7 @@ function ajax_comments_menu() {
     'page arguments' => array(2, 3),
     'type' => MENU_CALLBACK,
   );
-  
+
   $items['ajax_comments/edit/%'] = array(
     'page callback' => 'ajax_comments_edit',
     'access callback' => 'user_access',
@@ -28,7 +29,7 @@ function ajax_comments_menu() {
     'page arguments' => array(2),
     'type' => MENU_CALLBACK,
   );
-  
+
   $items['ajax_comments/delete/%'] = array(
     'page callback' => 'ajax_comments_delete',
     'access callback' => 'user_access',
@@ -36,7 +37,7 @@ function ajax_comments_menu() {
     'page arguments' => array(2),
     'type' => MENU_CALLBACK,
   );
-  
+
   $items['admin/config/content/ajax_comments'] = array(
     'title' => 'AJAX comments',
     'description' => 'AJAXifies comments on site.',
@@ -49,44 +50,44 @@ function ajax_comments_menu() {
 }
 
 /**
- * Implementation of hook_form_alter().
+ * Implements hook_form_FORM_ID_alter().
  */
 function ajax_comments_form_comment_form_alter(&$form, &$form_state, $form_id) {
   // Check to see if this node type uses ajax comments.
   if (!ajax_comments_node_type_active($form['#node']->type)) {
     return;
   }
-      
+
   $form['actions']['submit']['#ajax'] = array(
     'callback' => 'ajax_comments_submit_js',
     'wrapper' => $form['#id'],
     'method' => 'replace',
     'effect' => 'fade',
   );
-    
+
   // HACK, stop ctools from modifying us in node_comment_form.inc
   $form_state['ctools comment alter'] = FALSE;
 }
 
 /**
- * Implementation of hook_form_alter().
+ * Implements hook_form_FORM_ID_alter().
  */
 function ajax_comments_form_comment_confirm_delete_alter(&$form, &$form_state, $form_id) {
-  $comment = $form['#comment'];  
+  $comment = $form['#comment'];
   $node = node_load($comment->nid);
-  
+
   // Check to see if this node type uses ajax comments.
   if (!ajax_comments_node_type_active($node->type)) {
     return;
   }
-  
+
   $form['actions']['submit']['#ajax'] = array(
     'callback' => 'ajax_comments_delete_js',
     'wrapper' => $form['#id'],
     'method' => 'replace',
     'effect' => 'fade',
   );
-  
+
   $form['actions']['cancel']['#attributes']['onclick'][] = 'jQuery(\'#' . $form['#id'] . '\').siblings().show().end().remove(); return false;';
 }
 
@@ -98,26 +99,26 @@ function ajax_comments_submit_js($form, &$form_state) {
   if (form_get_errors()) {
     return $form;
   }
-    
-  // This is to remove the "Your comment has been posted" status message that 
+
+  // This is to remove the "Your comment has been posted" status message that
   // will appear upon refresh. This seems dirty but it means we don't have to
   // rewrite the whole comment_form_submit(). Please chime in if you think this is dumb.
   ajax_comments_remove_status($_SESSION);
-    
+
   $comment = $form_state['comment'];
   $node = $form['#node'];
   $notify_text = variable_get('ajax_comments_notify', '') ? theme('ajax_comments_notify_text') : '';
 
   $comment_build = comment_view($comment, $node);
 
-  // Are we editing a comment  
+  // Are we editing a comment
   if (isset($form['cid']['#value'])) {
     // remove wrapper because the form we replace exists inside the wrapper
     unset($comment_build['#prefix']);
     unset($comment_build['#suffix']);
-    
+
     // trim surrounding whitespace so ajax.js doesn't wrap us in a new div
-    $comment_output = trim(drupal_render($comment_build));    
+    $comment_output = trim(drupal_render($comment_build));
     $commands[] = ajax_command_replace('#' . $form['#id'], $comment_output);
   }
   // Or are we replying to another comment
@@ -125,7 +126,7 @@ function ajax_comments_submit_js($form, &$form_state) {
     // append comment to parent wrapper
     $comment_output = drupal_render($comment_build);
     $commands[] = ajax_command_append('#comment-wrapper-' . $comment->pid, $notify_text . $comment_output);
-    
+
     // delete the form
     $commands[] = ajax_command_invoke('#' . $form['#id'], 'remove');
   }
@@ -134,32 +135,32 @@ function ajax_comments_submit_js($form, &$form_state) {
     // append comment to root comment wrapper
     $comment_output = drupal_render($comment_build);
     $commands[] = ajax_command_append('#comment-wrapper', $notify_text . $comment_output);
-    
+
     // we were using the main comment form, replace it with a new one
     $node = $form['#node'];
-    
+
     $new_form_state = array();
     $new_form_state['build_info']['args'][] = (object) array('nid' => $node->nid);
-    $new_form_state['input'] = array(); // don't pull from cache        
-    $new_form_build = drupal_build_form($form['#form_id'], $new_form_state);    
+    $new_form_state['input'] = array(); // don't pull from cache
+    $new_form_build = drupal_build_form($form['#form_id'], $new_form_state);
     $new_form_output = drupal_render($new_form_build);
-    
+
     $commands[] = ajax_command_replace('#' . $form['#id'], $new_form_output);
-  }  
-  
+  }
+
   return array('#type' => 'ajax', '#commands' => $commands);
 }
 
 /**
- * Remove the comment.
+ * Removes the comment.
  */
-function ajax_comments_delete_js($form, &$form_state) {  
+function ajax_comments_delete_js($form, &$form_state) {
   $comment = $form['#comment'];
 
   ajax_comments_remove_status($_SESSION);
 
   $notify_text = variable_get('ajax_comments_notify', '') ? theme('ajax_comments_notify_text', array('type' => 'delete')) : '';
-  
+
   if ($notify_text) {
     $commands[] = ajax_command_replace('#comment-wrapper-' . $comment->cid, $notify_text);
   }
@@ -167,26 +168,26 @@ function ajax_comments_delete_js($form, &$form_state) {
     $commands[] = ajax_command_remove('#comment-wrapper-' . $comment->cid);
   }
 
-  
+
   return array('#type' => 'ajax', '#commands' => $commands);
 }
 
 /**
- * Implementation of hook_comment_view().
+ * Implements hook_comment_view().
  */
 function ajax_comments_comment_view($comment, $view_mode, $langcode) {
   $active = ajax_comments_node_type_active(substr($comment->node_type, strlen('comment_node_')));
-  
+
   if (!$active) {
     return;
   }
-  
+
   // Reply
   if (isset($comment->content['links']['comment']['#links']['comment-reply'])) {
     $comment->content['links']['comment']['#links']['comment-reply']['attributes']['class'] = array('use-ajax');
     $comment->content['links']['comment']['#links']['comment-reply']['href'] = 'ajax_comments/reply/' . $comment->nid . '/' . $comment->cid;
   }
-  
+
   // Edit
   if (isset($comment->content['links']['comment']['#links']['comment-edit'])) {
     $comment->content['links']['comment']['#links']['comment-edit']['attributes']['class'] = array('use-ajax');
@@ -201,7 +202,8 @@ function ajax_comments_comment_view($comment, $view_mode, $langcode) {
 }
 
 /**
- * Implementation of hook_node_view_alter().
+ * Implements hook_node_view_alter().
+ *
  * Wrap all comments in #comment-wrapper
  */
 function ajax_comments_node_view_alter(&$build) {
@@ -210,45 +212,47 @@ function ajax_comments_node_view_alter(&$build) {
 }
 
 /**
- * Implementation of hook_panels_pane_content_alter().
+ * Implements hook_panels_pane_content_alter().
+ *
  * Wrap all comments in #comment-wrapper
  */
-function ajax_comments_panels_pane_content_alter(&$content, $pane, $args, $context) {  
+function ajax_comments_panels_pane_content_alter(&$content, $pane, $args, $context) {
   if ($pane->type == 'node_comments') {
-    $content->content = '<div id="comment-wrapper">' . $content->content . '</div>'; 
+    $content->content = '<div id="comment-wrapper">' . $content->content . '</div>';
   }
 }
 
 /**
- * Implementation of hook_comment_view_alter().
+ * Implements hook_comment_view_alter().
+ *
  * Wrap comments and their replies in a #comment-wrapper-(cid) div
  */
 function ajax_comments_comment_view_alter(&$build, $view_mode) {
   $comment = $build['#comment'];
   $node = $build['#node'];
-  
+
   if (empty($comment->in_preview)) {
     $prefix = '';
-      
-    // close any previous wrapper elements    
+
+    // close any previous wrapper elements
     if ($comment->wrappers_to_close > 0) {
       $prefix .= str_repeat('</div>', $comment->wrappers_to_close);
     }
-    
+
     // add 'new' anchor if needed
     if (!empty($comment->first_new)) {
       $prefix .= "<a id=\"new\"></a>\n";
     }
-    
+
     // add wrapper tag
     $indent = $comment->pid != 0 && variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED) == COMMENT_MODE_THREADED;
     $prefix .= '<div id="comment-wrapper-' . $comment->cid . '"' . ($indent == TRUE ? ' class="indented"' : '') . '>';
 
     // add anchor tag
     $prefix .= "<a id=\"comment-$comment->cid\"></a>\n";
-    
+
     $build['#prefix'] = $prefix;
-    
+
     // close last wrapper element
     if(!empty($comment->final_wrappers_to_close)) {
       $build['#suffix'] = str_repeat('</div>', $comment->final_wrappers_to_close);
@@ -260,66 +264,66 @@ function ajax_comments_entity_prepare_view($entities, $entity_type, $langcode) {
   if ($entity_type == 'comment') {
     $i = 0;
     $opened = 0;
-    
+
     foreach ($entities as $id => $entity) {
       $depth = count(explode('.', $entity->thread)) - 1;
-    
+
       $entity->wrappers_to_close = 0;
-              
+
       if ($depth > $opened) {
         $opened++;
       } else {
         $entity->wrappers_to_close = ($i == 0 ? 0 : 1) + ($opened - $depth);
-      
+
         while ($depth < $opened) {
           $opened--;
         }
-      }      
-            
+      }
+
       $i++;
     }
-    
+
     $entities[$id]->final_wrappers_to_close = $opened + 1;
   }
 }
 
 /**
- *  Callback for clicking "reply".
+ * Callback for clicking "reply".
  */
 function ajax_comments_reply($nid, $cid) {
   // Necessary to make available only on certain nodes.
   $node = node_load($nid);
   $edit = array('nid' => $node->nid);
-  
+
   // If there is a cid this is a reply to a comment.
   if ($cid) {
     $edit = $edit + array('pid' => $cid);
   }
-  
+
   if (user_access('post comments') && $node->comment == COMMENT_NODE_OPEN && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) == COMMENT_FORM_BELOW)) {
-    $form_build = drupal_get_form("comment_node_{$node->type}_form", (object) $edit);    
+    $form_build = drupal_get_form("comment_node_{$node->type}_form", (object) $edit);
     $form = drupal_render($form_build);
   }
-  
+
   // Delete any extra forms we've created
   $commands[] = ajax_command_invoke('[id^=comment-wrapper-] form.comment-form', 'remove');
-    
+
   // Add the new form
   $commands[] = ajax_command_after('#comment-wrapper-' . $cid . ' >.comment', $form);
-  
+
   $page = array('#type' => 'ajax', '#commands' => $commands);
-  
+
   ajax_deliver($page);
 }
 
 /**
- *  Callback for clicking "edit".
+ * Callback for clicking "edit".
  */
 function ajax_comments_edit($cid) {
   global $base_path;
   global $user;
-  
-  // Load comment and related node  
+
+  // Load comment and related node
   $comment = comment_load($cid);
   $node = node_load($comment->nid);
   if ( ( (user_access('edit own comments') && $comment->uid == $user->uid ) || user_access('administer comments') )
@@ -328,46 +332,46 @@ function ajax_comments_edit($cid) {
     $form_build = drupal_get_form("comment_node_{$node->type}_form", $comment);
     $form = drupal_render($form_build);
   }
-  
+
   // Replace comment with form
   $commands[] = ajax_command_replace('#comment-wrapper-' . $cid . ' >.comment', $form);
-  
+
   $page = array('#type' => 'ajax', '#commands' => $commands);
-  
+
   ajax_deliver($page);
 }
 
 /**
- *  Callback for clicking "delete".
+ * Callback for clicking "delete".
  */
 function ajax_comments_delete($cid) {
   $comment = comment_load($cid);
-  
+
   if (!$comment) {
     return;
   }
-  
+
   // Need to include comment module admin file for delete form
   $form_state = array();
   $form_state['build_info']['args'] = array($comment);
-  
+
   // load this using form_load_include so it's cached properly and works in the ajax callback
-  form_load_include($form_state, 'inc', 'comment', 'comment.admin');  
-  $form_build = drupal_build_form('comment_confirm_delete', $form_state);  
+  form_load_include($form_state, 'inc', 'comment', 'comment.admin');
+  $form_build = drupal_build_form('comment_confirm_delete', $form_state);
   $form = drupal_render($form_build);
-  
+
   // Hide contents
   $commands[] = ajax_command_invoke('#comment-wrapper-' . $cid . ' >*', 'hide');
-  
+
   // Put form inside main comment wrapper
   $commands[] = ajax_command_prepend('#comment-wrapper-' . $cid, $form);
-  
-  $page = array('#type' => 'ajax', '#commands' => $commands);  
+
+  $page = array('#type' => 'ajax', '#commands' => $commands);
   ajax_deliver($page);
 }
 
 /**
- * Remove "Your comment has been posted." or "Your comment has been queued.."
+ * Removes "Your comment has been posted." or "Your comment has been queued.."
  *   from the status message.
  */
 function ajax_comments_remove_status(&$_SESSION) {
@@ -379,10 +383,10 @@ function ajax_comments_remove_status(&$_SESSION) {
       unset($_SESSION['messages']['status']);
     }
   }
-} 
+}
 
 /**
- * Return true if this node uses ajax comments.
+ * Returns true if this node uses ajax comments.
  */
 function ajax_comments_node_type_active($node_type) {
   $types = variable_get('ajax_comments_node_types');
@@ -390,18 +394,19 @@ function ajax_comments_node_type_active($node_type) {
 }
 
  /**
-  * Implementaiton of hook_theme().
+  * Implements hook_theme().
   */
 function ajax_comments_theme($existing, $type, $theme, $path) {
   return array(
     'ajax_comments_notify_text' => array(
       'variables' => array('type' => NULL),
-    ), 
+    ),
   );
 }
 
  /**
-  * Return text to notify user their comment has been added.
+  * Returns text to notify user their comment has been added.
+  *
   * @param type string
   *   Type of notification.
   */
@@ -410,6 +415,6 @@ function theme_ajax_comments_notify_text($type = NULL) {
   if ($type['type'] == 'delete') {
     $text = t('Your comment has been deleted');
   }
-  // Using messages html (minus .session which defaults to 960px width in bartik) for now.  
+  // Using messages html (minus .session which defaults to 960px width in bartik) for now.
   return '<div id="messages"><div class="clearfix"><div class="messages status"><h2 class="element-invisible">Status message</h2>' . $text . '</div></div></div>';
 }