diff --git a/payment/uc_payment_pack/uc_payment_pack.admin.inc b/payment/uc_payment_pack/uc_payment_pack.admin.inc
index ace78a6..74fcfb3 100644
--- a/payment/uc_payment_pack/uc_payment_pack.admin.inc
+++ b/payment/uc_payment_pack/uc_payment_pack.admin.inc
@@ -3,11 +3,15 @@
 /**
  * @file
  * Payment pack administration menu items.
- *
  */
 
 /**
  * Receives a check for an order and put in a clear date.
+ *
+ * @see uc_payment_pack_receive_check_form_validate()
+ * @see uc_payment_pack_receive_check_form_submit()
+ * @see theme_uc_payment_pack_receive_check_form()
+ * @ingroup forms
  */
 function uc_payment_pack_receive_check_form($form, &$form_state, $order) {
   $balance = uc_payment_balance($order);
@@ -58,6 +62,10 @@ function uc_payment_pack_receive_check_form($form, &$form_state, $order) {
 }
 
 /**
+ * Themes the receive check form.
+ *
+ * @see uc_payment_pack_receive_check_form()
+ * @see uc_payment_pack_receive_check_form_submit()
  * @ingroup themeable
  */
 function theme_uc_payment_pack_receive_check_form($variables) {
@@ -73,12 +81,24 @@ function theme_uc_payment_pack_receive_check_form($variables) {
   return $output;
 }
 
+/**
+ * Form validation for uc_payment_pack_receive_check_form().
+ *
+ * @see uc_payment_pack_receive_check_form()
+ * @see uc_payment_pack_receive_check_form_submit()
+ */
 function uc_payment_pack_receive_check_form_validate($form, &$form_state) {
   if (!$form_state['values']['check_exists'] && !is_numeric($form_state['values']['amount'])) {
     form_set_error('amount', t('The amount must be a number.'));
   }
 }
 
+/**
+ * Submit handler for uc_payment_pack_receive_check_form().
+ *
+ * @see uc_payment_pack_receive_check_form()
+ * @see uc_payment_pack_receive_check_form_validate()
+ */
 function uc_payment_pack_receive_check_form_submit($form, &$form_state) {
   global $user;
 
diff --git a/payment/uc_payment_pack/uc_payment_pack.module b/payment/uc_payment_pack/uc_payment_pack.module
index dddad86..e6c49d4 100644
--- a/payment/uc_payment_pack/uc_payment_pack.module
+++ b/payment/uc_payment_pack/uc_payment_pack.module
@@ -2,12 +2,9 @@
 
 /**
  * @file
- * Provides the check/money order, COD, and "other" payment methods.
+ * Provides the Check/Money Order, COD, and "Other" payment methods.
  */
 
-/*******************************************************************************
- * Hook Functions (Drupal)
- ******************************************************************************/
 
 /**
  * Implements hook_menu().
@@ -90,7 +87,7 @@ function uc_payment_pack_uc_payment_method() {
 }
 
 /**
- * Handles the generic payment method "Other."
+ * Payment method callback for the generic payment method "Other".
  */
 function uc_payment_method_other($op, &$order) {
   switch ($op) {
@@ -137,6 +134,12 @@ function uc_payment_method_other($op, &$order) {
   }
 }
 
+/**
+ * Form to collect additional information needed by payment method "Other".
+ *
+ * @see theme_uc_payment_method_other_form(). 
+ * @ingroup forms
+ */
 function uc_payment_method_other_form($form, &$form_state, $order) {
   $form['pm_other_description'] = array(
     '#type' => 'textfield',
@@ -149,6 +152,9 @@ function uc_payment_method_other_form($form, &$form_state, $order) {
 }
 
 /**
+ * Theme function for uc_payment_method_other_form(). 
+ *
+ * @see uc_payment_method_other_form(). 
  * @ingroup themeable
  */
 function theme_uc_payment_method_other_form($variables) {
@@ -162,7 +168,7 @@ function theme_uc_payment_method_other_form($variables) {
 }
 
 /**
- * Handles the Cash on Delivery payment method.
+ * Payment method callback for the "Cash on Delivery" payment method.
  */
 function uc_payment_method_cod($op, &$order) {
   switch ($op) {
@@ -181,9 +187,11 @@ function uc_payment_method_cod($op, &$order) {
 
     case 'cart-process':
       if (variable_get('uc_cod_delivery_date', FALSE)) {
-        $order->payment_details['delivery_month'] = intval($_POST['cod_delivery_month']);
-        $order->payment_details['delivery_day'] = intval($_POST['cod_delivery_day']);
-        $order->payment_details['delivery_year'] = intval($_POST['cod_delivery_year']);
+        $order->payment_details = array(
+          'delivery_month' => intval($_POST['cod_delivery_month']),
+          'delivery_day'   => intval($_POST['cod_delivery_day']),
+          'delivery_year'  => intval($_POST['cod_delivery_year']),
+        );
       }
       return TRUE;
 
@@ -233,9 +241,11 @@ function uc_payment_method_cod($op, &$order) {
     case 'order-load':
       $result = db_query("SELECT * FROM {uc_payment_cod} WHERE order_id = :id", array(':id' => $order->order_id));
       if ($row = $result->fetchObject()) {
-        $order->payment_details['delivery_month'] = $row->delivery_month;
-        $order->payment_details['delivery_day'] = $row->delivery_day;
-        $order->payment_details['delivery_year'] = $row->delivery_year;
+        $order->payment_details = array(
+          'delivery_month' => $row->delivery_month,
+          'delivery_day'   => $row->delivery_day,
+          'delivery_year'  => $row->delivery_year,
+        );
       }
       break;
 
@@ -256,8 +266,8 @@ function uc_payment_method_cod($op, &$order) {
         ->key(array('order_id' => $order->order_id))
         ->fields(array(
           'delivery_month' => $order->payment_details['delivery_month'],
-          'delivery_day' => $order->payment_details['delivery_day'],
-          'delivery_year' => $order->payment_details['delivery_year'],
+          'delivery_day'   => $order->payment_details['delivery_day'],
+          'delivery_year'  => $order->payment_details['delivery_year'],
         ))
         ->execute();
       break;
@@ -290,6 +300,13 @@ function uc_payment_method_cod($op, &$order) {
   }
 }
 
+/**
+ * Form to collect additional information needed by the "Cash on Delivery"
+ * payment method.
+ *
+ * @see theme_uc_payment_method_cod_form(). 
+ * @ingroup forms
+ */
 function uc_payment_method_cod_form($form, &$form_state, $order) {
   $month = (!empty($order->payment_details['delivery_month'])) ? $order->payment_details['delivery_month'] : format_date(REQUEST_TIME, 'custom', 'n');
   $form['cod_delivery_month'] = uc_select_month(NULL, $month);
@@ -304,6 +321,9 @@ function uc_payment_method_cod_form($form, &$form_state, $order) {
 }
 
 /**
+ * Theme function for uc_payment_method_cod_form(). 
+ *
+ * @see uc_payment_method_cod_form(). 
  * @ingroup themeable
  */
 function theme_uc_payment_method_cod_form($variables) {
@@ -325,12 +345,14 @@ function theme_uc_payment_method_cod_form($variables) {
 }
 
 /**
- * Handles the Check payment method.
+ * Payment method callback for the "Check" payment method.
  */
 function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL) {
   switch ($op) {
     case 'cart-details':
-      $build['instructions'] = array('#markup' => t('Checks should be made out to:'));
+      $build['instructions'] = array(
+        '#markup' => t('Checks should be made out to:')
+      );
 
       if (!variable_get('uc_check_mailing_street1', FALSE)) {
         $build['address'] = array(