diff --git a/README.md b/README.md
index 470d915..42966ce 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ### Webform Random
 This module provides a checkbox on the Webform Form Settings page located
-located at /node/%/webform/configure to display the form elements randomly.
+at /node/%/webform/configure to display the form elements randomly.
 
 ### Webform Random Fieldset
 This module provides a checkbox on the Webform Fieldset Component Settings page
@@ -13,7 +13,7 @@ located at /node/%/webform/components/% to display the fieldset elements randoml
 * [Webform 7.x-4.x](https://www.drupal.org/project/webform)
 
 ## Installation
-1. Copy the entire webform_random directory the Drupal sites/all/modules directory.
+1. Copy the entire webform_random directory to the Drupal sites/all/modules directory.
 2. Login as an administrator.
 3. Navigate to the Modules page at /admin/modules.
 4. Enable the Webform Random and/or Webform Random Fieldset module(s).
@@ -21,5 +21,5 @@ located at /node/%/webform/components/% to display the fieldset elements randoml
 
 ---
 ## Support
-File bugs with this module on Drupal.org at [Issues for Webform Random](http://drupal.org/project/issues/webform_random)
+File bugs with this module on Drupal.org at [Issues for Webform Random](http://drupal.org/project/issues/webform_random).
 
diff --git a/webform_random.info b/webform_random.info
index 5639e9a..af2d334 100644
--- a/webform_random.info
+++ b/webform_random.info
@@ -1,6 +1,7 @@
 name = Webform Random
 description = Gives each webform a checkbox to enable random display of all webform components.
-core = 7.x
 package = Webform
+core = 7.x
+version = 7.x-1.x-dev
 
 dependencies[] = webform
diff --git a/webform_random.install b/webform_random.install
index ae7409b..756c4ff 100644
--- a/webform_random.install
+++ b/webform_random.install
@@ -2,12 +2,12 @@
 
 /**
  * @file
- *   Webform_random module uninstall hooks.
+ * Webform Random module install/uninstall hooks.
  */
 
 /**
  * Implements hook_uninstall().
  */
 function webform_random_uninstall() {
-  db_delete('variable')->condition('name', db_like('webform_random_randomize_') . '%', 'LIKE')->execute();
+  db_delete('variable')->condition('name', 'webform_random_randomize_%', 'LIKE')->execute();
 }
diff --git a/webform_random.module b/webform_random.module
index 568f6c3..63dc290 100644
--- a/webform_random.module
+++ b/webform_random.module
@@ -1,52 +1,56 @@
 <?php
+
 /**
  * @file
- * This module provides a checkbox on the WebformForm Form Settings page located
- * located at /node/%/webform/configure to display all form elements randomly.
+ * This module provides a checkbox on the Webform Form Settings page.
+ *
+ * Visit /node/%/webform/configure to configure elements to display randomly.
  *
  * Contributions by Brandon Williams (@rocketeerbkw) and Ed Reel (@uberhacker)
  *
  * @author Nick Landis (@BiigNiick)
  */
 
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
 function webform_random_form_webform_configure_form_alter(&$form, &$form_state, $form_id) {
-  /* Random Settings */
+  // Random settings.
   $form['random'] = array(
-  // make a checkbox
-  '#type' => 'checkbox',
-    // put it at the top of the list
+    // Make a checkbox.
+    '#type' => 'checkbox',
+    // Put it at the top of the list.
     '#weight' => '-100',
-    // set a varible in the database that is unique to the webform
-    '#default_value' => variable_get('webform_random_randomize_'.$form['nid']['#value'], 0 ),
-    // label the checkbox so people know what it does
+    // Set a varible in the database that is unique to the webform.
+    '#default_value' => variable_get('webform_random_randomize_' . $form['nid']['#value'], 0),
+    // Label the checkbox so people know what it does.
     '#title' => t('Randomize top-level form elements'),
-    );
-//clicking submit calls a function
-$form['#submit'][] = '_webform_random_form_submit_save';
+  );
+  // Clicking submit calls a function.
+  $form['#submit'][] = '_webform_random_form_submit_save';
 }
 
 /**
  * Implements hook_form_submit().
  */
-function _webform_random_form_submit_save ($form, &$form_state) {
-  // set a variable when saving the form
-  variable_set('webform_random_randomize_'.$form['nid']['#value'], $form_state['values']['random']);
+function _webform_random_form_submit_save($form, &$form_state) {
+  // Set a variable when saving the form.
+  variable_set('webform_random_randomize_' . $form['nid']['#value'], $form_state['values']['random']);
 }
 
 /**
  * Implements hook_form_alter().
  */
 function webform_random_form_alter(&$form, &$form_state, $form_id) {
-  // if it is a webform get the variable for that node is set
-  if (substr($form_id, 0, 20) == 'webform_client_form_' && variable_get('webform_random_randomize_'.$form['#node']->nid, 0 )) {
-    // go through each item in the form
-    foreach	($form['submitted'] as $key => $value) {
-      // if the $value for the item is an array
+  // If it is a webform, get the variable for that node is set.
+  if (substr($form_id, 0, 20) == 'webform_client_form_' && variable_get('webform_random_randomize_' . $form['#node']->nid, 0)) {
+    // Go through each item in the form.
+    foreach ($form['submitted'] as $key => $value) {
+      // If the $value for the item is an array.
       if (is_array($value)) {
-        // change the array element of weight to a random number between -100 and 100
+        // Change weight attribute to a random number between -100 & 100.
         $form['submitted'][$key]['#weight'] = rand(-100, 100);
       }
     }
   }
 }
-
diff --git a/webform_random_fieldset/webform_random_fieldset.install b/webform_random_fieldset/webform_random_fieldset.install
index 36ca9fb..8e81abe 100644
--- a/webform_random_fieldset/webform_random_fieldset.install
+++ b/webform_random_fieldset/webform_random_fieldset.install
@@ -2,12 +2,12 @@
 
 /**
  * @file
- *   Webform_random module uninstall hooks.
+ * Webform Random Fieldset module install/uninstall hooks.
  */
 
 /**
  * Implements hook_uninstall().
  */
 function webform_random_fieldset_uninstall() {
-  db_delete('variable')->condition('name', db_like('webform_random_fieldset_randomize_') . '%', 'LIKE')->execute();
+  db_delete('variable')->condition('name', 'webform_random_fieldset_randomize_%', 'LIKE')->execute();
 }
diff --git a/webform_random_fieldset/webform_random_fieldset.module b/webform_random_fieldset/webform_random_fieldset.module
index 2c55abb..08de0aa 100644
--- a/webform_random_fieldset/webform_random_fieldset.module
+++ b/webform_random_fieldset/webform_random_fieldset.module
@@ -10,59 +10,58 @@
  */
 
 /**
- * Implements hook_form_alter().
+ * Implements hook_form_FORM_ID_alter().
  */
 function webform_random_fieldset_form_webform_component_edit_form_alter(&$form, &$form_state, $form_id) {
   /* Random Fieldset Settings */
-  // if this component is a fieldset
+  // If this component is a fieldset.
   if ($form['type']['#value'] == 'fieldset') {
-    // make a random_fieldset array in $form
+    // Make a random_fieldset array in $form.
     $form['random_fieldset'] = array(
-      // it's a checkbox
-    '#type' => 'checkbox',
-      // at the top of the list
+      // It's a checkbox.
+      '#type' => 'checkbox',
+      // At the top of the list.
       '#weight' => '-100',
-      // check to see if this component has a varialbe saved for it already
-      // and reflect that setting as the default value
-      '#default_value' => variable_get('webform_random_fieldset_randomize_'.$form['cid']['#value'], 0 ),
-      // label the checkbox with something that makes sense
+      // Check to see if this component has a varialbe saved for it already
+      // and reflect that setting as the default value.
+      '#default_value' => variable_get('webform_random_fieldset_randomize_' . $form['cid']['#value'], 0),
+      // Label the checkbox with something that makes sense.
       '#title' => t('Randomize fieldset elements'),
     );
-//clicking submit calls a function
-$form['#submit'][] = 'webform_random_fieldset_save_submit';
+    // Clicking submit calls a function.
+    $form['#submit'][] = 'webform_random_fieldset_save_submit';
   }
 }
 
 /**
  * Implements hook_form_submit().
  */
-function webform_random_fieldset_save_submit ($form, &$form_state) {
-  // set a variable when saving the form
-  variable_set('webform_random_fieldset_randomize_'.$form['cid']['#value'], $form_state['values']['random_fieldset']);
+function webform_random_fieldset_save_submit($form, &$form_state) {
+  // Set a variable when saving the form.
+  variable_set('webform_random_fieldset_randomize_' . $form['cid']['#value'], $form_state['values']['random_fieldset']);
 }
 
 /**
  * Implements hook_form_alter().
  */
 function webform_random_fieldset_form_alter(&$form, &$form_state, $form_id) {
-  // This is where the randomness happens.
-  // if its a webform
+  // This is where the randomness happens if it's a webform.
   if (substr($form_id, 0, 20) == 'webform_client_form_') {
-    // for every webform component get the key-value
-    foreach ($form['submitted'] as $key => $value ) {
-      // if the component is a fieldset
+    // For every webform component get the key-value.
+    foreach ($form['submitted'] as $key => $value) {
+      // If the component is a fieldset.
       if ($form['submitted'][$key]['#type'] == 'fieldset') {
-        // set a varialbe called cid to the fieldset's component ID
+        // Set a variable called cid to the fieldset's component ID.
         $cid = $form['submitted'][$key]['#webform_component']['cid'];
-        // is the webform_random_fieldset checkbox checked
-        $checked = variable_get('webform_random_fieldset_randomize_'.$cid);
-        // if the random checkbox is checked
+        // Is the webform_random_fieldset checkbox checked.
+        $checked = variable_get('webform_random_fieldset_randomize_' . $cid);
+        // If the random checkbox is checked.
         if ($checked) {
-          // go through each element in the fieldset
+          // Go through each element in the fieldset.
           foreach ($form['submitted'][$key] as $fieldset_key => $fieldset_value) {
-            // check to see if the $value for the item is an array
+            // Check to see if the $value for the item is an array.
             if (is_array($fieldset_value)) {
-              // change the array element of weight to a random number between -100 and 100
+              // Change weight attribute to a random number between -100 & 100.
               $form['submitted'][$key][$fieldset_key]['#weight'] = rand(-100, 100);
             }
           }