diff --git includes/handlers/gateways/pay_method_gateway.inc includes/handlers/gateways/pay_method_gateway.inc
index bc83959..8660226 100644
--- includes/handlers/gateways/pay_method_gateway.inc
+++ includes/handlers/gateways/pay_method_gateway.inc
@@ -25,7 +25,7 @@ class pay_method_gateway extends pay_method {
   var $cc_exp_year;
 
   /**
-   * Returning NULL will prevent anything from executing.  Subclasses are
+   * Returning NULL will prevent anything from executing. Subclasses are
    * responsible for returning a responsible url.
    */
   function gateway_url() {
@@ -194,8 +194,8 @@ class pay_method_gateway extends pay_method {
       );
     }
     if ($this->gateway_supports_ach) {
-      // TODO this is a stub.  We need to build the echeck form and validation
-      // functions for this to be relevant.  Thus it's commented out for now.
+      // TODO this is a stub. We need to build the echeck form and validation
+      // functions for this to be relevant. Thus it's commented out for now.
 
       //$payment_types['ach'] = t('Online checking transfer.');
     }
@@ -236,7 +236,7 @@ class pay_method_gateway extends pay_method {
     global $user;
 
     if (isset($this->gateway_testmode) && $this->gateway_testmode) {
-      drupal_set_message(t('The @name payment method is in test mode.  This transaction will not be fully processed.', array('@name' => $this->title())), 'warning');
+      drupal_set_message(t('The @name payment method is in test mode. This transaction will not be fully processed.', array('@name' => $this->title())), 'warning');
     }
 
     $form['#theme'] = 'pay_cc_form';
diff --git includes/handlers/gateways/pay_method_gateway_authorizenet.inc includes/handlers/gateways/pay_method_gateway_authorizenet.inc
index c70fe37..3fe8ccb 100644
--- includes/handlers/gateways/pay_method_gateway_authorizenet.inc
+++ includes/handlers/gateways/pay_method_gateway_authorizenet.inc
@@ -26,7 +26,7 @@ class pay_method_gateway_authorizenet extends pay_method_gateway {
   function gateway_request() {
     // Set the transaction type based on requested activity.
     if (!$txntype = $this->authorizenet_trxtype($this->activity->activity)) {
-      drupal_set_message("Payment activity '$this->activity->activity' is unsupported.  Not processing transaction", 'error');
+      drupal_set_message("Payment activity '$this->activity->activity' is unsupported. Not processing transaction", 'error');
       return FALSE;
     }
 
@@ -53,7 +53,7 @@ class pay_method_gateway_authorizenet extends pay_method_gateway {
       'caav_response'   => $r[39],
     );
 
-    /* Return TRUE if response_code = 1.  Possible values:
+    /* Return TRUE if response_code = 1. Possible values:
       1 = Approved
       2 = Declined
       3 = Error
@@ -94,7 +94,7 @@ class pay_method_gateway_authorizenet extends pay_method_gateway {
     $form[$group]['an']['authorizenet_developer'] = array(
       '#type' => 'checkbox',
       '#title' => t('This is a developer test account'),
-      '#description' => t('You can obtain a developer test account from http://developer.authorize.net/ and use those credentials for development and testing.  If the above values belong to a developer test account and not a real merchant account, check this box.'),
+      '#description' => t('You can obtain a developer test account from http://developer.authorize.net/ and use those credentials for development and testing. If the above values belong to a developer test account and not a real merchant account, check this box.'),
       '#default_value' => $this->authorizenet_developer,
       '#parents' => array($group, 'authorizenet_developer'),
     );
diff --git includes/handlers/gateways/pay_method_gateway_payflowpro.inc includes/handlers/gateways/pay_method_gateway_payflowpro.inc
index eacda00..47a0f0a 100644
--- includes/handlers/gateways/pay_method_gateway_payflowpro.inc
+++ includes/handlers/gateways/pay_method_gateway_payflowpro.inc
@@ -32,7 +32,7 @@ class pay_method_gateway_payflowpro extends pay_method_gateway {
 
     // Set the transaction type based on requested activity.
     if (!$txntype = $this->payflowpro_trxtype($this->activity->activity)) {
-      drupal_set_message("Payment activity '$this->activity->activity' is unsupported.  Not processing transaction", 'error');
+      drupal_set_message("Payment activity '$this->activity->activity' is unsupported. Not processing transaction", 'error');
       return FALSE;
     }
 
@@ -64,7 +64,7 @@ class pay_method_gateway_payflowpro extends pay_method_gateway {
     AUTHCODE: Returned for Sale, Authorization, and Voice Authorizations.
     AVSADDR: Y, N, X, or no response.
     AVSZIP: Y, N, X, or no response.
-    IAVS: Y, N, X, or no response.  Indicates whether address is international
+    IAVS: Y, N, X, or no response. Indicates whether address is international
   */
   function gateway_response($result) {
     $data = array();
diff --git includes/handlers/gateways/pay_method_gateway_paypal_pro.inc includes/handlers/gateways/pay_method_gateway_paypal_pro.inc
index 0d1825a..24915fa 100644
--- includes/handlers/gateways/pay_method_gateway_paypal_pro.inc
+++ includes/handlers/gateways/pay_method_gateway_paypal_pro.inc
@@ -39,7 +39,7 @@ class pay_method_gateway_paypal_pro extends pay_method_gateway {
     // Set the transaction type based on requested activity.
     if (!$txntype = $this->paypal_trxtype($this->activity->activity)) {
       drupal_set_message("Payment activity '$this->activity->activity' is unsupp
-orted.  Not processing transaction", 'error');
+orted. Not processing transaction", 'error');
       return FALSE;
     }
 
@@ -116,7 +116,7 @@ orted.  Not processing transaction", 'error');
     $form[$group]['pp']['paypal_sandbox'] = array(
       '#type' => 'checkbox',
       '#title' => t('This is a sandbox test account'),
-      '#description' => t('You can obtain a developer test account from https://www.x.com (The PayPal Develper Network) and use those credentials for development and testing.  If the above values belong to a developer test account and not a real merchant account, check this box.'),
+      '#description' => t('You can obtain a developer test account from https://www.x.com (The PayPal Develper Network) and use those credentials for development and testing. If the above values belong to a developer test account and not a real merchant account, check this box.'),
       '#default_value' => $this->paypal_sandbox,
       '#parents' => array($group, 'paypal_sandbox'),
     );
diff --git includes/handlers/gateways/pay_method_gateway_paypal_standard.inc includes/handlers/gateways/pay_method_gateway_paypal_standard.inc
index 81d869c..1d0062c 100644
--- includes/handlers/gateways/pay_method_gateway_paypal_standard.inc
+++ includes/handlers/gateways/pay_method_gateway_paypal_standard.inc
@@ -37,7 +37,7 @@ class pay_method_gateway_paypal_standard extends pay_method_gateway {
     // Set the transaction type based on requested activity.
     if (!$txntype = $this->paypal_trxtype($this->activity->activity)) {
       drupal_set_message("Payment activity '$this->activity->activity' is unsupp
-orted.  Not processing transaction", 'error');
+orted. Not processing transaction", 'error');
       return FALSE;
     }
 
@@ -100,7 +100,7 @@ orted.  Not processing transaction", 'error');
     $form[$group]['pp']['paypal_buttonid'] = array(
       '#type' => 'textfield',
       '#title' => t('Website Payments Standard Button ID'),
-      '#description' => t('The PayPal Website Payments Standard gateway requires the creation of a payment button through your PayPal account.  Once you\'ve created a button provide it\'s ID here.'),
+      '#description' => t('The PayPal Website Payments Standard gateway requires the creation of a payment button through your PayPal account. Once you\'ve created a button provide it\'s ID here.'),
       '#default_value' => $this->paypal_buttonid,
       '#required' => TRUE,
       '#parents' => array($group, 'paypal_buttonid'),
@@ -108,7 +108,7 @@ orted.  Not processing transaction", 'error');
     $form[$group]['pp']['paypal_sandbox'] = array(
       '#type' => 'checkbox',
       '#title' => t('This is a sandbox test account'),
-      '#description' => t('You can obtain a developer test account from https://www.x.com (The PayPal Develper Network) and use those credentials for development and testing.  If the above values belong to a developer test account and not a real merchant account, check this box.'),
+      '#description' => t('You can obtain a developer test account from https://www.x.com (The PayPal Develper Network) and use those credentials for development and testing. If the above values belong to a developer test account and not a real merchant account, check this box.'),
       '#default_value' => $this->paypal_sandbox,
       '#parents' => array($group, 'paypal_sandbox'),
     );
diff --git includes/handlers/pay.api.php includes/handlers/pay.api.php
index f69cdcc..ba32570 100644
--- includes/handlers/pay.api.php
+++ includes/handlers/pay.api.php
@@ -36,7 +36,7 @@ function hook_pay_method_handler_info() {
 /**
  * This hook is used to inform Pay of available payment form handlers.
  * A payment form is where an actual payment transaction is initiated (e.g.
- * a donation form, checkout page, etc.  It minimally includes an 'amount' 
+ * a donation form, checkout page, etc. It minimally includes an 'amount' 
  * field, and probably will provide users with the option to complete the
  * transaction by way of one or more payment methods.
  */
diff --git includes/handlers/pay.inc includes/handlers/pay.inc
index 3a516e2..2d83749 100644
--- includes/handlers/pay.inc
+++ includes/handlers/pay.inc
@@ -190,7 +190,7 @@ class pay {
 
     // If the form has not been officially submitted, but the handler
     // is present in $_REQUEST, it may be from a sub-form (e.g. an amount-only
-    // form).  Set the POSTed values.
+    // form). Set the POSTed values.
     if (!$form_state['submitted'] && isset($_REQUEST[$handler])) {
       foreach ($_REQUEST[$handler] as $posted_name => $posted_val) {
         $func = 'set_'. $posted_name;
diff --git includes/handlers/pay_form.inc includes/handlers/pay_form.inc
index 26c0ba5..97b6aa3 100644
--- includes/handlers/pay_form.inc
+++ includes/handlers/pay_form.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * The base class for payment activities.  All payment form classes should
+ * The base class for payment activities. All payment form classes should
  * extend this.
  */
 
@@ -82,7 +82,7 @@ class pay_form extends pay {
       '#type' => 'textfield',
       '#size' => 10,
       '#title' => t('Maximum amount'),
-      '#description' => t('The maximum allowed amount for this form.  If your payment method has a limit, this setting should reflect it.'),
+      '#description' => t('The maximum allowed amount for this form. If your payment method has a limit, this setting should reflect it.'),
       '#default_value' => $this->max_amount,
     );
 
diff --git includes/handlers/pay_method.inc includes/handlers/pay_method.inc
index 35cbc5a..fd28a3f 100644
--- includes/handlers/pay_method.inc
+++ includes/handlers/pay_method.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * The base class for payment activities.  All payment method classes should
+ * The base class for payment activities. All payment method classes should
  * extend this class.
  */
 
@@ -71,13 +71,13 @@ class pay_method extends pay {
     $form[$group]['title'] = array(
       '#type' => 'textfield',
       '#title' => t('Name'),
-      '#description' => t('This is what users see when they submit payments.  It is a good idea to keep it generic, such as "Credit card".'),
+      '#description' => t('This is what users see when they submit payments. It is a good idea to keep it generic, such as "Credit card".'),
       '#default_value' => $this->title,
     );
     $form[$group]['description'] = array(
       '#type' => 'textfield',
       '#title' => t('Description'),
-      '#description' => t('This is how the payment method will be listed in admin interfaces.  Use something that will set this apart from other payment methods.'),
+      '#description' => t('This is how the payment method will be listed in admin interfaces. Use something that will set this apart from other payment methods.'),
       '#default_value' => $this->description,
     );
     $form[$group]['min_amount'] = array(
@@ -97,10 +97,10 @@ class pay_method extends pay {
       '#title' => t('When a payment form is submitted'),
       '#options' => array(
         'complete' => t('Reflect the payment immediately.'),
-        'authorize' => t('Collect payment information and authorize the card (if applicable), but do not process payment.  Set the transaction to "Authorized".'),
+        'authorize' => t('Collect payment information and authorize the card (if applicable), but do not process payment. Set the transaction to "Authorized".'),
         '' => t('Do not collect payment information or process payment, leave the transaction as "Pending".'),
       ),
-      '#description' => t('In some cases, (for example, when delivering a product), you may be legally required to defer payment for review or further action.  If the payment method supports it, the transaction will be authorized but not processed.'),
+      '#description' => t('In some cases, (for example, when delivering a product), you may be legally required to defer payment for review or further action. If the payment method supports it, the transaction will be authorized but not processed.'),
       '#default_value' => $this->pay_form_activity,
     );
 
diff --git includes/views/pay.views.inc includes/views/pay.views.inc
index 4d8c838..252a9f9 100644
--- includes/views/pay.views.inc
+++ includes/views/pay.views.inc
@@ -267,7 +267,7 @@ function pay_views_data() {
 
   $data['pay_transaction']['total'] = array(
     'title' => t('Total amount'),
-    'help' => t('The total amount due.  This may be different from the amount paid if the transaction is not completed.'),
+    'help' => t('The total amount due. This may be different from the amount paid if the transaction is not completed.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
@@ -282,7 +282,7 @@ function pay_views_data() {
 
   $data['pay_transaction']['total_paid'] = array(
     'title' => t('Total paid'),
-    'help' => t('The total amount due.  This may be different from the total due if the transaction is not completed.'),
+    'help' => t('The total amount due. This may be different from the total due if the transaction is not completed.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
diff --git modules/pay_node/includes/pay_node.admin.inc modules/pay_node/includes/pay_node.admin.inc
index 483ada6..e08d885 100644
--- modules/pay_node/includes/pay_node.admin.inc
+++ modules/pay_node/includes/pay_node.admin.inc
@@ -16,13 +16,13 @@ function pay_node_admin_settings(&$form_state) {
     '#type' => 'checkbox',
     '#title' => t('Node creation'),
     '#default_value' => $pay_node_models['form'],
-    '#description' => t('Payment information will be requested on node creation forms.  This is useful for paid directory listings or other account information stored as nodes.'),
+    '#description' => t('Payment information will be requested on node creation forms. This is useful for paid directory listings or other account information stored as nodes.'),
   );
   $form['pay_node_models']['view'] = array(
     '#type' => 'checkbox',
     '#title' => t('Node display'),
     '#default_value' => $pay_node_models['view'],
-    '#description' => t('A payment form will be included on the display view of your nodes.  This is useful when you want to create multiple payment forms, such as fundraising campaigns, as nodes.'),
+    '#description' => t('A payment form will be included on the display view of your nodes. This is useful when you want to create multiple payment forms, such as fundraising campaigns, as nodes.'),
   );
 
   // Allowable form types.
@@ -58,7 +58,7 @@ function  pay_node_admin_node_type_form_alter(&$form, &$form_state) {
   if (!count($models) || !count($forms)) {
     $form['pay_node']['error'] = array(
       '#type' => 'markup',
-      '#value' => t('<p>In order to accept payments on this node type, you will need to enable at least one payment model and at least one form type.  You can configure these on the !pay_settings.</p>', array('!pay_settings' => l('payment settings page', 'admin/settings/pay/node'))),
+      '#value' => t('<p>In order to accept payments on this node type, you will need to enable at least one payment model and at least one form type. You can configure these on the !pay_settings.</p>', array('!pay_settings' => l('payment settings page', 'admin/settings/pay/node'))),
     );
     return;
   }
@@ -97,7 +97,7 @@ function  pay_node_admin_node_type_form_alter(&$form, &$form_state) {
     $form['pay_node']['view_form'] = array(
       '#type' => 'fieldset',
       '#title' => t('Payment form creation options'),
-      '#description' => t('Payment forms will be created or linked to your %type nodes.  These options control the form-creation and linking behavior.', array('%type' => $form['#node_type']->name)),
+      '#description' => t('Payment forms will be created or linked to your %type nodes. These options control the form-creation and linking behavior.', array('%type' => $form['#node_type']->name)),
     );
 
     $form['pay_node']['view_form']['pay_node_view_required'] = array(
@@ -174,7 +174,7 @@ function  pay_node_admin_node_type_form_alter(&$form, &$form_state) {
     $form['pay_node']['view_display'] = array(
       '#type' => 'fieldset',
       '#title' => t('Payment form display options'),
-      '#description' => t('Visitors will be able to make payments on forms attached to your @type nodes.  These options control how the forms will be displayed.', array('@type' => $form['#node_type']->name)),
+      '#description' => t('Visitors will be able to make payments on forms attached to your @type nodes. These options control how the forms will be displayed.', array('@type' => $form['#node_type']->name)),
     );
 
     $display_options = array('' => '<hidden>');
diff --git modules/pay_node/pay_node.module modules/pay_node/pay_node.module
index c5bfdbe..cee8f55 100644
--- modules/pay_node/pay_node.module
+++ modules/pay_node/pay_node.module
@@ -236,7 +236,7 @@ function pay_node_form_load($node) {
   // Rely on defaults.
   if (!isset($pay_form)) {
 
-    // The node is linked to a form.  Use the default value.
+    // The node is linked to a form. Use the default value.
     if ($method = 'select') {
       if ($pfid = variable_get('pay_node_view_default_select_'. $node->type, '')) {
         $pay_form = pay_form_load($pfid);
@@ -256,7 +256,7 @@ function pay_node_form_load($node) {
  * An after_build callback for the node editing form.
  */
 function pay_node_admin_node_form_after_build(&$form, &$form_state) {
-  // Add our submit handler after all of the others.  It's necessary to do this
+  // Add our submit handler after all of the others. It's necessary to do this
   // here because the pay_form does it this way and we want to come afterwards.
   $form['#submit'][] = 'pay_node_form_submit';
   return $form;
diff --git pay.module pay.module
index f86f7ff..201d546 100644
--- pay.module
+++ pay.module
@@ -217,7 +217,7 @@ function pay_form(&$form_state, $pay, $type = NULL, $form_type = 'default') {
   // forms differently based on user-defined context.
   $form_state['pay_form_type'] = $form_type;
 
-  // Allow this handler to alter in all of its form fields.  This will also
+  // Allow this handler to alter in all of its form fields. This will also
   // add the appropriate validate and submit callbacks for the Payment API.
   $pay->form($form, $form_state);
 
