diff --git a/Direct/commerce_veritrans_direct.info b/Direct/commerce_veritrans_direct.info
index b2dfda8..0a95663 100644
--- a/Direct/commerce_veritrans_direct.info
+++ b/Direct/commerce_veritrans_direct.info
@@ -3,11 +3,8 @@ description = Implements veritrans payment services for use with Drupal Commerce
 package = Commerce (payment)
 dependencies[] = commerce_veritrans
 
-core = 7.x
-
 ; Information added by Drupal.org packaging script on 2014-12-29
 version = "7.x-2.x-dev"
 core = "7.x"
 project = "commerce_veritrans"
 datestamp = "1419854882"
-
diff --git a/Direct/commerce_veritrans_direct.module b/Direct/commerce_veritrans_direct.module
index e6256d3..5e21554 100644
--- a/Direct/commerce_veritrans_direct.module
+++ b/Direct/commerce_veritrans_direct.module
@@ -25,6 +25,12 @@ function commerce_veritrans_direct_commerce_payment_method_info() {
 
 /**
  * Payment method callback: settings form.
+ *
+ * @param array $settings
+ *   Default value is NULL.
+ *
+ * @return array
+ *   Returns a form array.
  */
 function commerce_veritrans_direct_settings_form($settings = NULL) {
   $form = array();
@@ -58,7 +64,7 @@ function commerce_veritrans_direct_settings_form($settings = NULL) {
   $form['payment_type'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Payment type'),
-    '#options' => drupal_map_assoc(array(t('Credit Card'),)),
+    '#options' => drupal_map_assoc(array(t('Credit Card'))),
     '#default_value' => array('Credit Card'),
     '#attributes' => array('disabled' => 'disabled'),
   );
@@ -93,17 +99,8 @@ function commerce_veritrans_direct_settings_form($settings = NULL) {
 
 /**
  * Form used to collect veritranc data.
- *
- * @param array $payment_method
- *   The payment method instance object used to charge this payment.
- * @param array $pane_values
- *   The pane values.
- * @param array $checkout_pane
- *   The checkout pane.
- * @param Object $order
- *   The order object the payment applies to.
  */
-function commerce_veritrans_direct_submit_form($payment_method, $pane_values, $checkout_pane, $order) {
+function commerce_veritrans_direct_submit_form() {
   module_load_include('inc', 'commerce_payment', 'includes/commerce_payment.credit_card');
 
   // Prepare the fields to include on the credit card form.
@@ -121,8 +118,14 @@ function commerce_veritrans_direct_submit_form($payment_method, $pane_values, $c
 
 /**
  * Payment method callback: checkout form validation.
+ *
+ * @param array $pane_values
+ *   The pane_values is an array.
+ *
+ * @return bool Returns bool value.
+ *   Returns bool value.
  */
-function commerce_veritrans_direct_submit_form_validate($payment_method, $pane_form, $pane_values, $order, $form_parents = array()) {
+function commerce_veritrans_direct_submit_form_validate($pane_values, $form_parents = array()) {
   module_load_include('inc', 'commerce_payment', 'includes/commerce_payment.credit_card');
 
   // Validate the credit card fields.
@@ -140,19 +143,17 @@ function commerce_veritrans_direct_submit_form_validate($payment_method, $pane_f
  *
  * @param array $payment_method
  *   The payment method instance object used to charge this payment.
- * @param array $pane_form
- *   The pane form.
  * @param array $pane_values
  *   The pane values.
- * @param Object $order
+ * @param object $order
  *   The order object the payment applies to.
  * @param array $charge
  *   An array indicating the amount and currency code to charge.
- * 
+ *
  * @return bool
  *   Returns TRUE on success and FALSE on failure of transaction.
  */
-function commerce_veritrans_direct_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge) {
+function commerce_veritrans_direct_submit_form_submit($payment_method, $pane_values, $order, $charge) {
   // Display an error and prevent the payment attempt if Vt-Direct has not been
   // configured yet.
   if (empty($payment_method['settings'])) {
@@ -169,13 +170,13 @@ function commerce_veritrans_direct_submit_form_submit($payment_method, $pane_for
  *
  * @param array $payment_method
  *   The payment method instance object used to charge this payment.
- * @param Object $order
+ * @param object $order
  *   The order object the payment applies to.
  * @param array $charge
  *   An array indicating the amount and currency code to charge.
  * @param array $values
- *   The vlaues submited by user.
- * 
+ *   The values submitted by user.
+ *
  * @return bool
  *   Returns TRUE on success and FALSE on failure of transaction.
  */
@@ -221,7 +222,6 @@ function commerce_veritrans_direct_transaction($payment_method, $order, $charge,
     'first_name' => $billing_address['first_name'],
     'last_name' => $billing_address['last_name'],
     'email' => drupal_substr($order->mail, 0, 100),
-    //'phone' => $order_wrapper->commerce_customer_billing->commerce_veritrans_billing_phone->value(),
     'billing_address' => array(
       'first_name' => $billing_address['first_name'],
       'last_name' => $billing_address['last_name'],
@@ -229,7 +229,6 @@ function commerce_veritrans_direct_transaction($payment_method, $order, $charge,
       'city' => $billing_address['locality'],
       'postal_code' => $billing_address['postal_code'],
       'country_code' => commerce_veritrans_convert_country_code($billing_address['country']),
-    //'phone' => $order_wrapper->commerce_customer_billing->commerce_veritrans_billing_phone->value(),
     ),
   );
 
@@ -275,7 +274,6 @@ function commerce_veritrans_direct_transaction($payment_method, $order, $charge,
   }
   // We will verify transaction if needed.
   // Veritrans_Transaction::status.
-
   watchdog('commerce_veritrans', 'Veritrans Transaction:<pre> @param </pre>', array('@param' => print_r($transaction, TRUE)));
 
   commerce_payment_transaction_save($transaction);
diff --git a/README.txt b/README.txt
index 070650c..a2bd9cf 100644
--- a/README.txt
+++ b/README.txt
@@ -1,13 +1,18 @@
 -- SUMMARY --
-Commerce Veritrans[Drupal Commerce](https://drupal.org/project/commerce), module integrates with Veritrans(https://www.veritrans.co.id/) payment gateway into your Drupal Commerce shop.
+Commerce Veritrans[Drupal Commerce](https://drupal.org/project/commerce), module
+integrates with Veritrans(https://www.veritrans.co.id/) payment gateway into
+your Drupal Commerce shop.
 
 Veritrans Brief:
 =================
 Veritrans provides 2 methods : VT-Web and VT-direct.
-VT-Web :  Payment will be redirected to the payment page, Veritrans Style and interface kits have been provided Veritrans
-VT-direct : Payments will be processed on the Merchant side and Merchant has full control over the style and interface.
+VT-Web :  Payment will be redirected to the payment page, Veritrans Style and
+interface kits have been provided Veritrans
+VT-direct : Payments will be processed on the Merchant side and Merchant has
+full control over the style and interface.
 
-We supports VT-Web method. VT-direct and Recurring payment support will come soon.
+We supports VT-Web method. VT-direct and Recurring payment support will come
+soon.
 
 Resources:
 =============
@@ -16,16 +21,20 @@ http://docs.veritrans.co.id/welcome/welcome.html
 -- REQUIREMENTS --
 To use this module, you need to signup as a merchant with Veritrans.
 For more information, please visit https://www.veritrans.co.id/product.html
-Once you are Merchant, you will receive a Merchant Id, Client and Server Key, which you will require while configuring, your Drupal commerce store.
+Once you are Merchant, you will receive a Merchant Id, Client and Server Key,
+which you will require while configuring, your Drupal commerce store.
 
 -- INSTALLATION --
-The <a href="https://github.com/veritrans/veritrans-php">Veritrans PHP Library</a> should exist in a directory named "veritrans" under "libraries"
+The <a href="https://github.com/veritrans/veritrans-php">Veritrans PHP Library
+</a> should exist in a directory named "veritrans" under "libraries"
 
 * Install as usual, see http://drupal.org/node/70151 for further information.
-* To change Merchant Id and Payment Mode(Test Transactions or Live Transactions), Go to Store settings > Payment methods admin/commerce/config/payment-methods.
+* To change Merchant Id and Payment Mode(Test Transactions or Live Transactions)
+*, Go to Store settings > Payment methods admin/commerce/config/payment-methods.
 * Look for Veritrans from available payment methods and click edit link.
 * Under "Enable payment method: Veritrans" Action, click edit link. 
-* Enter Server Key and Select Payment mode as Live transactions for Veritrans to accept real payments.
+* Enter Server Key and Select Payment mode as Live transactions for Veritrans to
+ accept real payments.
 
 -- CONTACT --
 https://www.drupal.org/u/nitesh-pawar
diff --git a/Web/commerce_veritrans_web.info b/Web/commerce_veritrans_web.info
index 352afe1..970fd1d 100644
--- a/Web/commerce_veritrans_web.info
+++ b/Web/commerce_veritrans_web.info
@@ -3,11 +3,8 @@ description = Implements veritrans payment services for use with Drupal Commerce
 package = Commerce (payment)
 dependencies[] = commerce_veritrans
 
-core = 7.x
-
 ; Information added by Drupal.org packaging script on 2014-12-29
 version = "7.x-2.x-dev"
 core = "7.x"
 project = "commerce_veritrans"
 datestamp = "1419854882"
-
diff --git a/Web/commerce_veritrans_web.module b/Web/commerce_veritrans_web.module
index 23e77f5..c587e24 100644
--- a/Web/commerce_veritrans_web.module
+++ b/Web/commerce_veritrans_web.module
@@ -49,16 +49,16 @@ function commerce_veritrans_web_settings_form($settings = NULL) {
 
   /*
    * If Need then pass these types in options.
-   * $types = array(t('Credit Card'), t('Mandiri ClickPay'),t('CIMB Clicks'), 
+   * $types = array(t('Credit Card'), t('Mandiri ClickPay'),t('CIMB Clicks'),
    * t('Virtual Account'), t('e-Pay BRI'),);
    */
-   
+
   $form['payment_type'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Payment type'),
-    '#options' => drupal_map_assoc(array(t('Credit Card'),)),
+    '#options' => drupal_map_assoc(array(t('Credit Card'))),
     '#default_value' => array('Credit Card'),
-    '#attributes' => array('disabled'=>'disabled'),
+    '#attributes' => array('disabled' => 'disabled'),
   );
 
   $form['is_sanitized'] = array(
@@ -91,7 +91,8 @@ function commerce_veritrans_web_settings_form($settings = NULL) {
 
 /**
  * Payment method callback: redirect form.
- *   A wrapper around the module's general use function for building a WPS form.
+ *
+ * A wrapper around the module's general use function for building a WPS form.
  */
 function commerce_veritrans_web_redirect_form($form, &$form_state, $order, $payment_method) {
   // Return an error if the enabling action's settings haven't been configured.
diff --git a/commerce_veritrans.install b/commerce_veritrans.install
index 6342be5..046d8fa 100644
--- a/commerce_veritrans.install
+++ b/commerce_veritrans.install
@@ -4,6 +4,7 @@
  * @file
  * Performs install/uninstall used for Commerce Veritrans.
  */
+
 // Field name for Commerce direcpay billing phone.
 define('COMMERCE_VERITRANS_BILLING_PHONE_FIELD', 'commerce_veritrans_billing_phone');
 
@@ -92,9 +93,12 @@ function commerce_veritrans_install() {
 
 /**
  * Commerce customer module creates a customer profile type called "billing".
- *   This profile type only has the field "addressfield", which does not
- *   include a phone number. Veritrans requires a phone number for
- *   transactions, so we create our own.
+ *
+ * This profile type only has the field "addressfield".
+ *
+ * This doesn't include a phone number.
+ *
+ * Veritrans requires a phone number for transactions, so we create our own.
  */
 function commerce_veritrans_add_phone_field() {
   // Look for or add a billing phone field to add to billing customer profile.
diff --git a/commerce_veritrans.module b/commerce_veritrans.module
index d761c9d..9be59b1 100644
--- a/commerce_veritrans.module
+++ b/commerce_veritrans.module
@@ -82,13 +82,6 @@ function commerce_veritrans_menu() {
 /**
  * Processes an incoming IPN.
  *
- * @param string $payment_method
- *   The payment method instance array that originally made the payment.
- * @param array $debug_ipn
- *   Optionally specify an IPN array for debug purposes; if left empty, the IPN
- *     be pulled from the $_POST. If an IPN is passed in, validation of the IPN
- *     at PayPal will be bypassed.
- *
  * @return bool
  *   TRUE or FALSE indicating whether the IPN was successfully processed or not.
  */
@@ -128,9 +121,7 @@ function commerce_veritrans_process_ipn() {
       }
     }
     elseif ($transaction_status == 'cancel') {
-      // if ($fraud == 'challenge' || $fraud == 'accept') {
       $transaction->status = COMMERCE_PAYMENT_STATUS_FAILURE;
-      //}
     }
     elseif ($transaction_status == 'deny') {
       $transaction->status = COMMERCE_PAYMENT_STATUS_FAILURE;