diff --git a/commerce_discount.module b/commerce_discount.module
index 517a261..18a833b 100644
--- a/commerce_discount.module
+++ b/commerce_discount.module
@@ -81,7 +81,7 @@ function commerce_discount_commerce_cart_order_refresh($wrapper) {
 /**
  * Remove discount components from a given price and recalculate the total.
  *
- * @param $price_wrapper
+ * @param object $price_wrapper
  *   Wrapped commerce price.
  */
 function commerce_discount_remove_discount_components($price_wrapper) {
@@ -451,7 +451,7 @@ function commerce_discount_commerce_discount_rule_build($rule, $discount) {
 /**
  * Return an array of all defined discount types.
  *
- * @return
+ * @return array
  *   The array of types, keyed by type name.
  */
 function commerce_discount_types() {
@@ -480,10 +480,10 @@ function commerce_discount_types() {
 /**
  * Loads the data for a specific discount type.
  *
- * @param $discount_type
+ * @param string $discount_type
  *   The machine name of a discount type.
  *
- * @return
+ * @return mixed
  *   The requested array or FALSE if not found.
  */
 function commerce_discount_type($discount_type) {
@@ -495,10 +495,10 @@ function commerce_discount_type($discount_type) {
 /**
  * Returns the human readable name of any or all discount types.
  *
- * @param $type
+ * @param string $type
  *   Optional parameter specifying the type whose name to return.
  *
- * @return
+ * @return mixed
  *   Either an array of all discount type names keyed by the machine name or a
  *     string containing the human readable name for the specified type. If a
  *     type is specified that does not exist, this function returns FALSE.
@@ -528,7 +528,7 @@ function commerce_discount_type_get_name($type = NULL) {
 /**
  * Return an array of all defined discount offer types.
  *
- * @return
+ * @return array
  *   The array of types, keyed by type name.
  */
 function commerce_discount_offer_types() {
@@ -557,10 +557,10 @@ function commerce_discount_offer_types() {
 /**
  * Loads the data for a specific discount offer type.
  *
- * @param $offer_type
+ * @param string $offer_type
  *   The machine name of an offer type.
  *
- * @return
+ * @return mixed
  *   The requested array or FALSE if not found.
  */
 function commerce_discount_offer_type($offer_type) {
@@ -572,10 +572,10 @@ function commerce_discount_offer_type($offer_type) {
 /**
  * Returns the human readable name of any or all discount offer types.
  *
- * @param $type
+ * @param string $type
  *   Optional parameter specifying the offer type whose name to return.
  *
- * @return
+ * @return mixed
  *   Either an array of all discount offer type names keyed by the machine name
  *   or a string containing the human readable name for the specified type.
  *   If a type is specified that does not exist, this function returns FALSE.
diff --git a/commerce_discount.rules.inc b/commerce_discount.rules.inc
index e5da997..7556245 100644
--- a/commerce_discount.rules.inc
+++ b/commerce_discount.rules.inc
@@ -112,7 +112,6 @@ function commerce_discount_rules_event_info() {
   return $items;
 }
 
-
 /**
  * Rules action: Apply fixed amount discount.
  */
diff --git a/includes/commerce_discount.admin.inc b/includes/commerce_discount.admin.inc
index 6389069..51b3995 100644
--- a/includes/commerce_discount.admin.inc
+++ b/includes/commerce_discount.admin.inc
@@ -38,6 +38,7 @@ class CommerceDiscountUIController extends EntityDefaultUIController {
       }
     }
     field_attach_submit('commerce_discount', $entity, $form['commerce_discount_fields'], $form_state);
+
     return $entity;
   }
 
@@ -65,7 +66,6 @@ class CommerceDiscountUIController extends EntityDefaultUIController {
     );
     $items[$this->path . '/add']['title callback'] = 'commerce_discount_get_action_title';
     $items[$this->path . '/import']['title callback'] = 'commerce_discount_get_action_title';
-
     $items[$this->path . '/settings'] = array(
       'title' => 'Settings',
       'description' => 'Additional settings for Commerce Discounts.',
@@ -121,6 +121,7 @@ function commerce_discount_get_action_title($op, $entity_type) {
   switch ($op) {
     case 'add':
       return t('Add discount');
+
     case 'import':
       return t('Import discount');
   }
@@ -129,9 +130,14 @@ function commerce_discount_get_action_title($op, $entity_type) {
 /**
  * Form callback: create or edit a discount.
  *
- * @param $discount
- *   The discount type array to edit or for a create form an empty discount
- *   type array with properties instantiated but not populated.
+ * @param array $form
+ *   Standard Drupal $form.
+ * @param array $form_state
+ *   Standard Drupal $form_state.
+ * @param CommerceDiscount $commerce_discount
+ *   Comment me.
+ * @param string $op
+ *   Current operation.
  */
 function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_discount, $op = 'edit') {
   // We might have gotten the commerce discount type via ajax, so set it
@@ -208,6 +214,7 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_
     '#tree' => TRUE,
     '#parents' => array('commerce_discount_fields'),
   );
+
   field_attach_form('commerce_discount', $commerce_discount, $form['commerce_discount_fields'], $form_state);
   // Remove the title and surrounding fieldset from the offer reference field.
   $form['commerce_discount_fields']['commerce_discount_offer'][LANGUAGE_NONE]['#title'] = NULL;
@@ -244,7 +251,7 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_
       '#value' => t('Delete discount'),
       '#weight' => 45,
       '#limit_validation_errors' => array(),
-      '#submit' => array('commerce_discount_form_submit_delete')
+      '#submit' => array('commerce_discount_form_submit_delete'),
     );
   }