diff --git a/commerce_redhen.admin.inc b/commerce_redhen.admin.inc
index 0d45bd4..715518a 100644
--- a/commerce_redhen.admin.inc
+++ b/commerce_redhen.admin.inc
@@ -1,8 +1,8 @@
 <?php
 
 /**
-  * Defines the settings form for the module.
-  */
+ * Defines the settings form for the module.
+ */
 function commerce_redhen_settings_form() {
   $form = array();
 
@@ -39,12 +39,12 @@ function commerce_redhen_settings_form() {
 }
 
 /**
-  * Submit handler for the commerce_redhen_settings_form().
-  */
+ * Submit handler for the commerce_redhen_settings_form().
+ */
 function commerce_redhen_settings_form_submit($form, &$form_state) {
   $selected_product_types = array();
   foreach($form_state['values']['redhen_product_types'] as $machine_name => $product_type) {
-    // If a product type has been selected, add the relevant fields to it
+    // If a product type has been selected, add the relevant fields to it.
     if ($product_type) {
       drupal_set_message(t('The <em>@product_type</em> product type now has the require fields to grant memberships.',
         array(
@@ -53,11 +53,9 @@ function commerce_redhen_settings_form_submit($form, &$form_state) {
 
       $selected_product_types[] = $product_type;
 
-      /**
-        * Add an entityreference field to the product type
-        */
+      // Add an entityreference field to the product type.
 
-      // Create the field if it does not yet exist
+      // Create the field if it does not yet exist.
       if (!field_info_field('commerce_redhen_membership')) {
         $field = array(
           'field_name' => 'commerce_redhen_membership',
@@ -71,7 +69,7 @@ function commerce_redhen_settings_form_submit($form, &$form_state) {
         field_create_field($field);
       }
 
-      // Create the instance if it does not yet exist for this product type
+      // Create the instance if it does not yet exist for this product type.
       if (!field_info_instance('commerce_product', 'commerce_redhen_membership', $product_type)) {
         $instance = array(
           'field_name' => 'commerce_redhen_membership',
@@ -86,11 +84,9 @@ function commerce_redhen_settings_form_submit($form, &$form_state) {
         field_create_instance($instance);
       }
 
-      /**
-        * Add an interval field to the product type
-        */
+      // Add an interval field to the product type.
 
-      // Create the field if it does not yet exist
+      // Create the field if it does not yet exist.
       if (!field_info_field('commerce_redhen_interval')) {
         $field = array(
           'field_name' => 'commerce_redhen_interval',
@@ -101,7 +97,7 @@ function commerce_redhen_settings_form_submit($form, &$form_state) {
         field_create_field($field);
       }
 
-      // Create the instance if it does not yet exist for this product type
+      // Create the instance if it does not yet exist for this product type.
       if (!field_info_instance('commerce_product', 'commerce_redhen_interval', $product_type)) {
         $instance = array(
           'field_name' => 'commerce_redhen_interval',
@@ -114,7 +110,7 @@ function commerce_redhen_settings_form_submit($form, &$form_state) {
       }
 
     } else {
-      // If not selected, then remove the field isntances from the product type
+      // If not selected, then remove the field isntances from the product type.
       if ($instance = field_info_instance('commerce_product', 'commerce_redhen_membership', $machine_name)) {
         field_delete_instance($instance);
       }
@@ -125,7 +121,7 @@ function commerce_redhen_settings_form_submit($form, &$form_state) {
     }
   }
 
-  // Save the selection, so we can set the default values in the form
+  // Save the selection, so we can set the default values in the form.
   variable_set('commerce_redhen_selected_product_types', $selected_product_types);
   drupal_set_message(t('The settings have been saved.'));
 }
diff --git a/commerce_redhen.info b/commerce_redhen.info
index 8aafb9a..78c2c85 100644
--- a/commerce_redhen.info
+++ b/commerce_redhen.info
@@ -6,3 +6,4 @@ dependencies[] = redhen_membership
 dependencies[] = commerce_product
 dependencies[] = entityreference
 dependencies[] = interval
+
diff --git a/commerce_redhen.install b/commerce_redhen.install
index 5fd6557..8678669 100644
--- a/commerce_redhen.install
+++ b/commerce_redhen.install
@@ -1,9 +1,9 @@
 <?php
 
 /**
-  * Implements hook_enable().
-  * Display a message if RedHen still needs to be configured and setup.
-  */
+ * Implements hook_enable().
+ * Display a message if RedHen still needs to be configured and setup.
+ */
 
 function commerce_redhen_enable() {
   if (!redhen_contact_get_types()) {
diff --git a/commerce_redhen.module b/commerce_redhen.module
index b14526c..02ee355 100644
--- a/commerce_redhen.module
+++ b/commerce_redhen.module
@@ -1,8 +1,8 @@
 <?php
 
 /**
-  * Implements hook_menu().
-  */
+ * Implements hook_menu().
+ */
 function commerce_redhen_menu() {
   return array(
     'admin/commerce/config/redhen' => array(
diff --git a/commerce_redhen.rules.inc b/commerce_redhen.rules.inc
index fa29d80..e2bf7e6 100644
--- a/commerce_redhen.rules.inc
+++ b/commerce_redhen.rules.inc
@@ -1,8 +1,8 @@
 <?php
 
 /**
-  * Implements hook_rules_action_info().
-  */
+ * Implements hook_rules_action_info().
+ */
 function commerce_redhen_rules_action_info() {
   return array(
     'commerce_redhen_rules_create_membership_from_product' => array(
@@ -40,8 +40,8 @@ function commerce_redhen_rules_action_info() {
 }
 
 /**
-  * Implements hook_rules_condition_info().
-  */
+ * Implements hook_rules_condition_info().
+ */
 function commerce_redhen_rules_condition_info() {
   return array(
     'commerce_redhen_rules_does_user_have_contact' => array(
@@ -60,9 +60,9 @@ function commerce_redhen_rules_condition_info() {
 
 
 /**
-  * Action callback for custom rules action. Creates a membership based on the product
-  * and user.
-  */
+ * Action callback for custom rules action. Creates a membership based on the product
+ * and user.
+ */
 function commerce_redhen_rules_create_membership_from_product($product, $user, $create_contact, $contact_type) {
   $product_wrapper = entity_metadata_wrapper('commerce_product', $product);
   $membership_type = $product_wrapper->commerce_redhen_membership->name->value();
@@ -88,8 +88,8 @@ function commerce_redhen_rules_set_email_for_contact($contact, $email) {
 }
 
 /**
-  * Defines the options list for the Create Contact setting.
-  */
+ * Defines the options list for the Create Contact setting.
+ */
 function commerce_redhen_contact_rules_options_list() {
   return array(
     0 => t('No'),
@@ -98,8 +98,8 @@ function commerce_redhen_contact_rules_options_list() {
 }
 
 /**
-  * Condition callback for checking if a user has a RedHen Contact
-  */
+ * Condition callback for checking if a user has a RedHen Contact
+ */
 
 function commerce_redhen_rules_does_user_have_contact($user) {
   if (redhen_contact_user_contact($user)) {
diff --git a/commerce_redhen.rules_defaults.inc b/commerce_redhen.rules_defaults.inc
index feb0792..7e2eb6c 100644
--- a/commerce_redhen.rules_defaults.inc
+++ b/commerce_redhen.rules_defaults.inc
@@ -1,15 +1,15 @@
 <?php
 
 /**
-  * Implements hook_default_rules_configuration().
-  */
+ * Implements hook_default_rules_configuration().
+ */
 function commerce_redhen_default_rules_configuration() {
   $rules = array();
 
   /**
-    * Define Rule to Create the RedHen Contact for the Order Owner if one does not
-    * already exist.
-    */
+   * Define Rule to Create the RedHen Contact for the Order Owner if one does not
+   * already exist.
+   */
   $contact_types = redhen_contact_type_options_list();
 
   // If no contact types defined, set a warning message.
@@ -62,9 +62,9 @@ function commerce_redhen_default_rules_configuration() {
   $rules['commerce_redhen_create_redhen_contact'] = $rule;
 
   /**
-    * Define Rule Component that creates a RedHen Membership based on the product
-    * that has been purchased.
-    */
+   * Define Rule Component that creates a RedHen Membership based on the product
+   * that has been purchased.
+   */
 
   $rule = rule(array(
     'line_item' => array(
@@ -105,8 +105,8 @@ function commerce_redhen_default_rules_configuration() {
   $rules['commerce_redhen_create_membership_from_product_component'] = $rule;
 
   /**
-    * Define Rule to Create the RedHen Membership for the Order Owner.
-    */
+   * Define Rule to Create the RedHen Membership for the Order Owner.
+   */
 
   $rule = rules_reaction_rule();
   $rule->label = 'Create RedHen Memberships After Checkout';