diff --git a/js/customAffirmMPP.js b/js/customAffirmMPP.js
index 5706a99..4a268f6 100644
--- a/js/customAffirmMPP.js
+++ b/js/customAffirmMPP.js
@@ -55,9 +55,9 @@
           affirm.ui.ready(function () {
             // Payment estimate options.
             var options = {
-              apr: arp, // Percentage assumed APR for loan.
-              months: month, // Can be 3, 6, or 12.
-              amount: $(item).attr('data-value') * 100, // USD cents.
+              apr: arp, /* Percentage assumed APR for loan. */
+              months: month, /* Can be 3, 6, or 12. */
+              amount: $(item).attr('data-value') * 100, /* USD cents. */
             };
             try {
               // Try and access the function.
@@ -96,9 +96,9 @@
         }
         // Payment estimate options.
         var options = {
-          apr: arp, // Percentage assumed APR for loan.
-          months: month, // Can be 3, 6, or 12.
-          amount: amount // USD cents.
+          apr: arp, /* Percentage assumed APR for loan. */
+          months: month, /* Can be 3, 6, or 12. */
+          amount: amount /* USD cents. */
         };
         try {
           // Try and access the function.
diff --git a/uc_affirm.module b/uc_affirm.module
index 0a0aded..46bc3aa 100644
--- a/uc_affirm.module
+++ b/uc_affirm.module
@@ -32,10 +32,10 @@ define('UC_AFFIRM_VOID', 'void');
 define('UC_AFFIRM_REFUND', 'refund');
 
 /* Payment received status. */
-define('ORDER_STATUS_PAYMENT_RECEIVED', 'payment_received');
+define('UC_AFFIRM_ORDER_STATUS_PAYMENT_RECEIVED', 'payment_received');
 
 /* Transaction authorized status. */
-define('ORDER_STATUS_AUTHORIZED', 'order_under_review');
+define('UC_AFFIRM_ORDER_STATUS_AUTHORIZED', 'order_under_review');
 
 /**
  * Implements hook_menu().
@@ -384,22 +384,27 @@ function uc_affirm_api_request($txn_type, $order, $charge_id = NULL, $data = arr
   if (($result = drupal_json_decode($response)) && (is_array($result))) {
     if (isset($result['status_code'])) {
       watchdog(
-          'Affirm response data',
-          "!message<br/>Transaction type: !txn_type<br/><br/>"
-          . "The request returned from Affirm with the following data:"
-          . " !data<br/>The request concerned the following order:"
-          . " !order", array(
-        '!message' => $result['message'],
-        '!txn_type' => $txn_type,
-        '!data' => '<pre>' . check_plain(print_r($result, TRUE)) . '</pre>',
-        '!order' => '<pre>' . check_plain(print_r($order, TRUE)) . '</pre>',
-          ), WATCHDOG_ERROR);
+        'Affirm response data',
+        'The request returned from Affirm with the following data:!data<br/>The request concerned the following order:!order',
+        array(
+          '!message' => $result['message'],
+          '!txn_type' => $txn_type,
+          '!data' => '<pre>' . check_plain(print_r($result, TRUE)) . '</pre>',
+          '!order' => '<pre>' . check_plain(print_r($order, TRUE)) . '</pre>',
+        ),
+         WATCHDOG_ERROR
+      );
     }
     else {
-      watchdog('Affirm response data', '!function Response:!data', array(
-        '!function' => __FUNCTION__,
-        '!data' => '<pre>' . print_r(drupal_json_decode($response), TRUE) . '</pre>',
-          ), WATCHDOG_WARNING);
+      watchdog(
+        'Affirm response data',
+        '!function Response:!data',
+        array(
+          '!function' => __FUNCTION__,
+          '!data' => '<pre>' . print_r(drupal_json_decode($response), TRUE) . '</pre>',
+        ),
+        WATCHDOG_WARNING
+      );
     }
     return $result;
   }
@@ -481,7 +486,7 @@ function uc_affirm_uc_order_actions($order) {
     $refund_data = db_query("SELECT * FROM {uc_affirm} WHERE order_id = :id", array(':id' => $order->order_id))->fetchObject();
     $default_amount = $order->order_total - $refund_data->refund_amount;
     if ($default_amount > 0) {
-      if ($order->order_status == ORDER_STATUS_PAYMENT_RECEIVED && $order->payment_method == "affirm") {
+      if ($order->order_status == UC_AFFIRM_ORDER_STATUS_PAYMENT_RECEIVED && $order->payment_method == "affirm") {
         $title = t('Refund !order_id.', array('!order_id' => $order->order_id));
         $actions[] = array(
           'name' => t('Refund'),
@@ -492,7 +497,7 @@ function uc_affirm_uc_order_actions($order) {
       }
     }
     // Response is autherized added the capture and refund option.
-    if ($order->order_status == ORDER_STATUS_AUTHORIZED && $order->payment_method == "affirm") {
+    if ($order->order_status == UC_AFFIRM_ORDER_STATUS_AUTHORIZED && $order->payment_method == "affirm") {
       $title = t('Void order !order_id.', array('!order_id' => $order->order_id));
       // Void option.
       $actions[] = array(