diff --git a/README.txt b/README.txt
index d38c129..d73c8cf 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,10 @@
 Description
 -----------
-This is a simple module that replaces form actions for all anonymous users with a dummy URL which is then replaced using javascript before form submission. All spambot submissions (from bots that don't execute javascript) will go to a blackhole. Will require javascript to work for normal users. 
+This is a simple module that replaces form actions for all anonymous
+users with a dummy URL which is then replaced using javascript before
+form submission. All spambot submissions (from bots that don't execute
+javascript) will go to a blackhole. Will require javascript to work
+for normal users.
 
 Configuration
 -------------
@@ -20,4 +24,4 @@ Uninstallation
 
 Credits
 -------
-Written by Zyxware, http://www.zyxware.com/
+Written by Zyxware, http://www.zyxware.com
diff --git a/spam_blackhole.info b/spam_blackhole.info
index 65b1696..df9b0fa 100644
--- a/spam_blackhole.info
+++ b/spam_blackhole.info
@@ -4,6 +4,3 @@ package = "Spam control"
 core = 7.x
 configure = admin/config/content/spam-blackhole
 scripts[] = spam_blackhole.js
-files[] = spam_blackhole.module
-files[] = spam_blackhole.install
-
diff --git a/spam_blackhole.install b/spam_blackhole.install
index 0438f01..88c8f43 100644
--- a/spam_blackhole.install
+++ b/spam_blackhole.install
@@ -1,15 +1,9 @@
 <?php
 
-/*
- * @file
- * Spam Blackhole Module install file
- */
-
 /**
- * Implements hook_install().
+ * @file
+ * Install, update and uninstall functions for the spam blackhole module.
  */
-function spam_blackhole_install() {
-}
 
 /**
  * Implements hook_uninstall().
diff --git a/spam_blackhole.js b/spam_blackhole.js
index 706e0ae..ae5b980 100644
--- a/spam_blackhole.js
+++ b/spam_blackhole.js
@@ -1,19 +1,28 @@
+/**
+ * @file
+ * Spam Blackhole Javascript handler.
+ */
+
 (function ($) {
-Drupal.behaviors.spam_blackhole = {
-  attach: function (context) {
-    if (Drupal.settings.spam_blackhole && Drupal.settings.spam_blackhole.forms) {
-      $('input[name="form_id"]:not(.spam-blackhole-processed)', context).each(function () {
-        forms = Drupal.settings.spam_blackhole.forms;
-        for (var i = 0; i < forms.length; i++) {
-          form_id = $(this).attr('value');
-          if (forms[i] == form_id) {
-            cur_form = $(this).parents('form')[0];
-            action = $(cur_form).attr('action');
-            $(cur_form).attr('action', action.replace(Drupal.settings.spam_blackhole.dummy_url, Drupal.settings.spam_blackhole.base_url));
+  Drupal.behaviors.spam_blackhole = {
+    attach: function (context) {
+      if (Drupal.settings.spam_blackhole && Drupal.settings.spam_blackhole.forms) {
+        var spam_element = 'input[name="form_id"]:not(.spam-blackhole-processed)';
+        $(spam_element, context).each(function () {
+          forms = Drupal.settings.spam_blackhole.forms;
+          for (var i = 0; i < forms.length; i++) {
+            form_id = $(this).attr('value');
+            if (forms[i] == form_id) {
+              cur_form = $(this).parents('form')[0];
+              action = $(cur_form).attr('action');
+              $(cur_form).attr('action', action.replace(
+                  Drupal.settings.spam_blackhole.dummy_url,
+                  Drupal.settings.spam_blackhole.base_url
+              ));
+            }
           }
-        }
-      }).addClass('spam-blackhole-processed');
+        }).addClass('spam-blackhole-processed');
+      }
     }
-  }
-};
+  };
 })(jQuery);
diff --git a/spam_blackhole.module b/spam_blackhole.module
index c24ef52..e075ff8 100644
--- a/spam_blackhole.module
+++ b/spam_blackhole.module
@@ -1,7 +1,8 @@
 <?php
 
-/* @file
- * The spam_blackhole module file
+/**
+ * @file
+ * Defines spambot form submissions to a blackhole.
  */
 
 /**
@@ -27,16 +28,18 @@ function spam_blackhole_menu() {
 function spam_blackhole_init() {
   global $base_url;
   global $user;
-  // Don't do anything if this is an authenticated user
+  // Don't do anything if this is an authenticated user.
   if ($user->uid != 0) {
     return;
   }
   $base_domain = drupal_substr($base_url, 0, strpos($base_url, '/', 8));
   drupal_add_js(
-    array('spam_blackhole' => array(
-      'base_url' => $base_domain,
-      'dummy_url' => variable_get('spam_blackhole_dummy_base_url', 'http://www.example.com'),
-    )),
+    array(
+      'spam_blackhole' => array(
+        'base_url' => $base_domain,
+        'dummy_url' => variable_get('spam_blackhole_dummy_base_url', 'http://www.example.com'),
+      ),
+    ),
     'setting'
   );
   drupal_add_js(drupal_get_path('module', 'spam_blackhole') . '/spam_blackhole.js');
@@ -47,7 +50,7 @@ function spam_blackhole_init() {
  */
 function spam_blackhole_form_alter(&$form, $form_state, $form_id) {
   global $user;
-  // Don't do anything if this is an authenticated user
+  // Don't do anything if this is an authenticated user.
   if ($user->uid != 0) {
     return;
   }
@@ -65,7 +68,7 @@ function spam_blackhole_form_alter(&$form, $form_state, $form_id) {
 
   $is_form_excluded = FALSE;
 
-  // Check form level filtering
+  // Check form level filtering.
   $filter_by_form = variable_get('spam_blackhole_filter_by_form', 0);
   if ($filter_by_form > 0) {
     $form_match = preg_match($form_id_regexp, $form_id);
@@ -79,14 +82,16 @@ function spam_blackhole_form_alter(&$form, $form_state, $form_id) {
     }
   }
 
-  // If form is not excluded then apply spam blackhole
+  // If form is not excluded then apply spam blackhole.
   if (!$is_form_excluded) {
     $forms[$num_forms] = $form_id;
-    // Add form_ids to be sent to javascript
+    // Add form_ids to be sent to javascript.
     drupal_add_js(
-      array('spam_blackhole' => array(
-        'forms' => $forms,
-      )),
+      array(
+        'spam_blackhole' => array(
+          'forms' => $forms,
+        ),
+      ),
       'setting'
     );
     // Do this only if the form action was not modified by somebody else.
@@ -98,7 +103,7 @@ function spam_blackhole_form_alter(&$form, $form_state, $form_id) {
 }
 
 /**
- * Spam blackhole admin settings form
+ * Spam blackhole admin settings form.
  */
 function spam_blackhole_settings_form() {
   $form = array();
@@ -124,7 +129,7 @@ function spam_blackhole_settings_form() {
   $options = array(
     t('Apply on all forms.'),
     t('Apply on every form except the listed forms.'),
-    t('Apply only on the listed forms.')
+    t('Apply only on the listed forms.'),
   );
   $description = t("Enter one form_id per line. You can use * as a wild character.");
   $form['spam_blackhole_filter_options']['spam_blackhole_filter_by_form'] = array(