diff --git a/commerce_subscription.info b/commerce_subscription.info
index 96117f0..d067e01 100644
--- a/commerce_subscription.info
+++ b/commerce_subscription.info
@@ -15,3 +15,4 @@ dependencies[] = date
 files[] = commerce_subscription.module
 files[] = includes/commerce_subscription.controller.inc
 files[] = includes/commerce_subscription_recurrence.controller.inc
+
diff --git a/commerce_subscription.module b/commerce_subscription.module
index 98eecbd..be0be1c 100644
--- a/commerce_subscription.module
+++ b/commerce_subscription.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Defines module's constants and an event handler.
+ */
+
 define('COMMERCE_SUBSCRIPTION_CREATED',         1);
 define('COMMERCE_SUBSCRIPTION_TRIAL',           2);
 define('COMMERCE_SUBSCRIPTION_ACTIVE',          3);
@@ -13,13 +18,11 @@ define('COMMERCE_SUBSCRIPTION_DURATION_WEEKS',  2);
 define('COMMERCE_SUBSCRIPTION_DURATION_MONTHS', 3);
 define('COMMERCE_SUBSCRIPTION_DURATION_YEARS',  4);
 
-
-
 /**
  * Handler for payment events
  */
-
 function commerce_subscription_handle_event($type = 'subscription_payment',$transaction) {
   $order = $order = commerce_order_load($transaction->order_id);
   rules_invoke_all($type,$order, $transaction);
 }
+
diff --git a/commerce_subscription.rules.inc b/commerce_subscription.rules.inc
index 9c02acc..64f8e6a 100644
--- a/commerce_subscription.rules.inc
+++ b/commerce_subscription.rules.inc
@@ -1,13 +1,12 @@
 <?php
+
 /**
+ * @file
  * Rules include file - event & action definitions
  */
 
-
 /**
  * Implements hook_rules_event_info
- *
- * @return array
  */
 function commerce_subscription_rules_event_info() {
 
@@ -18,8 +17,6 @@ function commerce_subscription_rules_event_info() {
     entity_rules_events_variables('commerce_payment_transaction', t('Last completed transaction'), TRUE)
   );
 
-
-
   $items = array(
     'subscription_initial_payment' => array(
       'label' => 'Initial subscription payment',
@@ -60,3 +57,4 @@ function commerce_subscription_rules_event_info() {
 
   return $items;
 }
+
diff --git a/modules/commerce_subscription_payment_example/commerce_subscription_payment_example.module b/modules/commerce_subscription_payment_example/commerce_subscription_payment_example.module
index de95b1a..d49c22a 100644
--- a/modules/commerce_subscription_payment_example/commerce_subscription_payment_example.module
+++ b/modules/commerce_subscription_payment_example/commerce_subscription_payment_example.module
@@ -1,99 +1,99 @@
 <?php
 
-  /**
-   * @file
-   * Provides an example payment method for Drupal Commerce for testing and
-   *   development.
-   */
-
-
-  /**
-   * Implements hook_commerce_payment_method_info().
-   */
-  function commerce_subscription_payment_example_commerce_payment_method_info() {
-    $payment_methods = array();
-
-    $payment_methods['commerce_subscription_payment_example'] = array(
-      'title' => t('Example subscription payment'),
-      'description' => t('Demonstrates complete payment during checkout and serves as a development example.'),
-      'active' => TRUE,
-    );
-
-    return $payment_methods;
+/**
+ * @file
+ * Provides an example payment method for Drupal Commerce for testing and
+ *   development.
+ */
+
+/**
+ * Implements hook_commerce_payment_method_info().
+ */
+function commerce_subscription_payment_example_commerce_payment_method_info() {
+  $payment_methods = array();
+
+  $payment_methods['commerce_subscription_payment_example'] = array(
+    'title' => t('Example subscription payment'),
+    'description' => t('Demonstrates complete payment during checkout and serves as a development example.'),
+    'active' => TRUE,
+  );
+
+  return $payment_methods;
+}
+
+/**
+ * Payment method callback: submit form.
+ */
+function commerce_subscription_payment_example_submit_form($payment_method, $pane_values, $checkout_pane, $order) {
+  $form = array();
+
+  // Merge in values from the order.
+  if (!empty($order->data['commerce_subscription_payment_example'])) {
+    $pane_values += $order->data['commerce_subscription_payment_example'];
   }
 
-  /**
-   * Payment method callback: submit form.
-   */
-  function commerce_subscription_payment_example_submit_form($payment_method, $pane_values, $checkout_pane, $order) {
-    $form = array();
-
-    // Merge in values from the order.
-    if (!empty($order->data['commerce_subscription_payment_example'])) {
-      $pane_values += $order->data['commerce_subscription_payment_example'];
-    }
-
-    // Merge in default values.
-    $pane_values += array(
-      'name' => '',
-    );
-
-    $form['name'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Name'),
-      '#description' => t('This is a demonstration field coded to fail validation for single character values.'),
-      '#default_value' => $pane_values['name'],
-      '#required' => TRUE,
-    );
-
-    return $form;
+  // Merge in default values.
+  $pane_values += array(
+    'name' => '',
+  );
+
+  $form['name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Name'),
+    '#description' => t('This is a demonstration field coded to fail validation for single character values.'),
+    '#default_value' => $pane_values['name'],
+    '#required' => TRUE,
+  );
+
+  return $form;
+}
+
+/**
+ * Payment method callback: submit form validation.
+ */
+function commerce_subscription_payment_example_submit_form_validate($payment_method, $pane_form, $pane_values, $order, $form_parents = array()) {
+  // Throw an error if a long enough name was not provided.
+  if (strlen($pane_values['name']) < 2) {
+    form_set_error(implode('][', array_merge($form_parents, array('name'))), t('You must enter a name two or more characters long.'));
+
+    // Even though the form error is enough to stop the submission of the form,
+    // it's not enough to stop it from a Commerce standpoint because of the
+    // combined validation / submission going on per-pane in the checkout form.
+    return FALSE;
   }
+}
+
+/**
+ * Payment method callback: submit form submission.
+ */
+function commerce_subscription_payment_example_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge) {
+  $order->data['commerce_subscription_payment_example'] = $pane_values;
+
+  commerce_subscription_payment_example_transaction($payment_method, $order, $charge, $pane_values['name']);
+}
+
+/**
+ * Creates an example payment transaction for the specified charge amount.
+ *
+ * @param $payment_method
+ *   The payment method instance object used to charge this payment.
+ * @param $order
+ *   The order object the payment applies to.
+ * @param $charge
+ *   An array indicating the amount and currency code to charge.
+ * @param $name
+ *   The name entered on the submission form.
+ */
+function commerce_subscription_payment_example_transaction($payment_method, $order, $charge, $name) {
+  $transaction = commerce_payment_transaction_new('commerce_payment_example', $order->order_id);
+  $transaction->instance_id = $payment_method['instance_id'];
+  $transaction->amount = $charge['amount'];
+  $transaction->currency_code = $charge['currency_code'];
+  $transaction->status = COMMERCE_PAYMENT_STATUS_SUCCESS;
+  $transaction->message = 'Name: @name';
+  $transaction->message_variables = array('@name' => $name);
+
+  commerce_payment_transaction_save($transaction);
+  commerce_subscription_handle_event('subscription_initial_payment',$transaction);
+}
 
-  /**
-   * Payment method callback: submit form validation.
-   */
-  function commerce_subscription_payment_example_submit_form_validate($payment_method, $pane_form, $pane_values, $order, $form_parents = array()) {
-    // Throw an error if a long enough name was not provided.
-    if (strlen($pane_values['name']) < 2) {
-      form_set_error(implode('][', array_merge($form_parents, array('name'))), t('You must enter a name two or more characters long.'));
-
-      // Even though the form error is enough to stop the submission of the form,
-      // it's not enough to stop it from a Commerce standpoint because of the
-      // combined validation / submission going on per-pane in the checkout form.
-      return FALSE;
-    }
-  }
-
-  /**
-   * Payment method callback: submit form submission.
-   */
-  function commerce_subscription_payment_example_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge) {
-    $order->data['commerce_subscription_payment_example'] = $pane_values;
-
-    commerce_subscription_payment_example_transaction($payment_method, $order, $charge, $pane_values['name']);
-  }
-
-  /**
-   * Creates an example payment transaction for the specified charge amount.
-   *
-   * @param $payment_method
-   *   The payment method instance object used to charge this payment.
-   * @param $order
-   *   The order object the payment applies to.
-   * @param $charge
-   *   An array indicating the amount and currency code to charge.
-   * @param $name
-   *   The name entered on the submission form.
-   */
-  function commerce_subscription_payment_example_transaction($payment_method, $order, $charge, $name) {
-    $transaction = commerce_payment_transaction_new('commerce_payment_example', $order->order_id);
-    $transaction->instance_id = $payment_method['instance_id'];
-    $transaction->amount = $charge['amount'];
-    $transaction->currency_code = $charge['currency_code'];
-    $transaction->status = COMMERCE_PAYMENT_STATUS_SUCCESS;
-    $transaction->message = 'Name: @name';
-    $transaction->message_variables = array('@name' => $name);
-
-    commerce_payment_transaction_save($transaction);
-    commerce_subscription_handle_event('subscription_initial_payment',$transaction);
-  }
diff --git a/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.info b/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.info
index 9bdaf3a..320c1f3 100644
--- a/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.info
+++ b/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.info
@@ -6,3 +6,4 @@ dependencies[] = commerce
 dependencies[] = commerce_payment
 dependencies[] = commerce_subscription
 core = 7.x
+
diff --git a/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.install b/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.install
index 526938c..5969ab0 100644
--- a/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.install
+++ b/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.install
@@ -1,74 +1,73 @@
 <?php
 
-  /**
-   * @file
-   * Install, update and uninstall functions for the commerce_subscription_paypal_wps module.
-   */
+/**
+ * @file
+ * Install, update and uninstall functions for the commerce_subscription_paypal_wps module.
+ */
 
+/**
+ * Implements hook_schema().
+ */
+function commerce_subscription_paypal_wps_schema() {
+  $schema = array();
 
-
-  /**
-   * Implements hook_schema().
-   */
-  function commerce_subscription_paypal_wps_schema() {
-    $schema = array();
-
-    $schema['commerce_subscription_paypal_wps'] = array(
-      'description' => 'The base table for paypal subscriptions.',
-      'fields' => array(
-        'subscription_id' => array(
-          'description' => 'The primary identifier for a subscription, used internally only.',
-          'type' => 'serial',
-          'unsigned' => TRUE,
-          'not null' => TRUE,
-        ),
-        'type' => array(
-          'description' => 'The {commerce_product_type}.type of this product.',
-          'type' => 'varchar',
-          'length' => 255,
-          'not null' => TRUE,
-          'default' => '',
-        ),
-        'created' => array(
-          'description' => 'The Unix timestamp when the product was created.',
-          'type' => 'int',
-          'not null' => TRUE,
-          'default' => 0,
-        ),
-        'changed' => array(
-          'description' => 'The Unix timestamp when the product was most recently saved.',
-          'type' => 'int',
-          'not null' => TRUE,
-          'default' => 0,
-        ),
-        'uid' => array(
-          'description' => 'The {users}.uid that owns this product.',
-          'type' => 'int',
-          'not null' => TRUE,
-          'default' => 0,
-        ),
-        'status' => array(
-          'description' => 'Boolean indicating where the subscription is in its lifecycle.',
-          'type' => 'int',
-          'size' => 'tiny',
-          'not null' => TRUE,
-          'default' => 1,
-        ),
+  $schema['commerce_subscription_paypal_wps'] = array(
+    'description' => 'The base table for paypal subscriptions.',
+    'fields' => array(
+      'subscription_id' => array(
+        'description' => 'The primary identifier for a subscription, used internally only.',
+        'type' => 'serial',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+      ),
+      'type' => array(
+        'description' => 'The {commerce_product_type}.type of this product.',
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
       ),
-      'primary key' => array('subscription_id'),
-      'indexes' => array(
-        'uid' => array('uid'),
-        'subscription' => array('subscription_id'),
+      'created' => array(
+        'description' => 'The Unix timestamp when the product was created.',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
       ),
-      'unique keys' => array(
+      'changed' => array(
+        'description' => 'The Unix timestamp when the product was most recently saved.',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
       ),
-      'foreign keys' => array(
-        'owner' => array(
-          'table' => 'users',
-          'columns' => array('uid' => 'uid'),
-        ),
+      'uid' => array(
+        'description' => 'The {users}.uid that owns this product.',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
       ),
-    );
+      'status' => array(
+        'description' => 'Boolean indicating where the subscription is in its lifecycle.',
+        'type' => 'int',
+        'size' => 'tiny',
+        'not null' => TRUE,
+        'default' => 1,
+      ),
+    ),
+    'primary key' => array('subscription_id'),
+    'indexes' => array(
+      'uid' => array('uid'),
+      'subscription' => array('subscription_id'),
+    ),
+    'unique keys' => array(
+    ),
+    'foreign keys' => array(
+      'owner' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
+    ),
+  );
+
+  return $schema;
+}
 
-    return $schema;
-  }
diff --git a/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.module b/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.module
index 8cd8ace..0241d3b 100644
--- a/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.module
+++ b/modules/commerce_subscription_paypal_wps/commerce_subscription_paypal_wps.module
@@ -5,13 +5,11 @@
  * Provides an example payment method for Drupal Commerce for PayPal
  */
 
-
 /**
  * Implements hook_commerce_payment_method_info().
  */
 function commerce_subscription_paypal_wps_commerce_payment_method_info() {
 
-
   $payment_methods = array();
 
   $icons = commerce_subscription_paypal_wps_icons();
@@ -30,11 +28,9 @@ function commerce_subscription_paypal_wps_commerce_payment_method_info() {
     'offsite_autoredirect' => TRUE,
   );
 
-
   return $payment_methods;
 }
 
-
 /**
  * Payment method callback: settings form.
  */
@@ -104,8 +100,7 @@ function commerce_subscription_paypal_wps_settings_form($settings = NULL) {
   return $form;
 }
 
-
-  /**
+/**
  * Returns an array of PayPal payment method icon img elements.
  *
  * @return
@@ -291,8 +286,8 @@ function commerce_subscription_paypal_wps_server_url($server) {
   }
 }
 
-  /**
-  * Returns the IPN URL.
+/**
+ * Returns the IPN URL.
  *
  * @param $method_id
   *   Optionally specify a payment method ID to include in the URL.
@@ -328,7 +323,6 @@ function commerce_subscription_paypal_wps_currencies() {
 /**
  * Implementation of hook_entity_info()
  */
-
 function commerce_subscription_paypal_wps_entity_info() {
 
   $entity_info = array();
@@ -348,6 +342,6 @@ function commerce_subscription_paypal_wps_entity_info() {
     ),
   );
 
-
   return $entity_info;
 }
+
diff --git a/modules/commerce_subscription_paypal_wps/theme/commerce_subscription_paypal_wps.css b/modules/commerce_subscription_paypal_wps/theme/commerce_subscription_paypal_wps.css
index f9f0f33..5486db4 100644
--- a/modules/commerce_subscription_paypal_wps/theme/commerce_subscription_paypal_wps.css
+++ b/modules/commerce_subscription_paypal_wps/theme/commerce_subscription_paypal_wps.css
@@ -10,3 +10,4 @@
   top: 6px;
   margin-right: 4px;
 }
+