diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..c5419fe
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,5 @@
+Payment Gateway API aka PGAPI module for sites where don't need
+full support shopping cart, but need receive payments online.
+
+PGAPI is packaged for download at http://drupal.org/project/pgapi.
+Learn more at documentation page http://drupal.org/node/1849544.
diff --git a/includes/pgapi_ui.payments.inc b/includes/pgapi_ui.payments.inc
index 2d5f936..a55439b 100644
--- a/includes/pgapi_ui.payments.inc
+++ b/includes/pgapi_ui.payments.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *  Page callbacks and form builder functions for administering payments.
+ * Page callbacks and form builder functions for administering payments.
  */
 
 /**
diff --git a/includes/views/handlers/pgapi_handler_field_payment_status.inc b/includes/views/handlers/pgapi_handler_field_payment_status.inc
index c1f8773..3d9998b 100644
--- a/includes/views/handlers/pgapi_handler_field_payment_status.inc
+++ b/includes/views/handlers/pgapi_handler_field_payment_status.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Contains the payment status field handler.
+ */
+
+/**
  * Field handler to translate an order status into its readable form.
  */
 class pgapi_handler_field_payment_status extends pgapi_handler_field_transaction {
diff --git a/includes/views/handlers/pgapi_handler_field_transaction.inc b/includes/views/handlers/pgapi_handler_field_transaction.inc
index 5e1fcd9..7a88025 100644
--- a/includes/views/handlers/pgapi_handler_field_transaction.inc
+++ b/includes/views/handlers/pgapi_handler_field_transaction.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Contains the basic transaction field handler.
+ * Contains the basic transaction field handler.
  */
 
 /**
diff --git a/includes/views/handlers/pgapi_handler_field_transaction_link.inc b/includes/views/handlers/pgapi_handler_field_transaction_link.inc
index c5fe815..2a47451 100644
--- a/includes/views/handlers/pgapi_handler_field_transaction_link.inc
+++ b/includes/views/handlers/pgapi_handler_field_transaction_link.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Contains the link of payment field handler.
+ */
+
+/**
  * Field handler to present a link to a payment.
  */
 class pgapi_handler_field_transaction_link extends views_handler_field {
diff --git a/includes/views/handlers/pgapi_handler_field_transaction_link_delete.inc b/includes/views/handlers/pgapi_handler_field_transaction_link_delete.inc
index 50b1395..93392ff 100644
--- a/includes/views/handlers/pgapi_handler_field_transaction_link_delete.inc
+++ b/includes/views/handlers/pgapi_handler_field_transaction_link_delete.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Contains field handler for link to delete payment.
+ */
+
+/**
  * Field handler to present a link to delete a product.
  */
 class pgapi_handler_field_transaction_link_delete extends pgapi_handler_field_transaction_link {
diff --git a/includes/views/handlers/pgapi_handler_field_transaction_link_edit.inc b/includes/views/handlers/pgapi_handler_field_transaction_link_edit.inc
index edd9db7..fa49d7b 100644
--- a/includes/views/handlers/pgapi_handler_field_transaction_link_edit.inc
+++ b/includes/views/handlers/pgapi_handler_field_transaction_link_edit.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Contains field handler for link to edit payment.
+ */
+
+/**
  * Field handler to present a payment edit link.
  */
 class pgapi_handler_field_transaction_link_edit extends pgapi_handler_field_transaction_link {
diff --git a/includes/views/handlers/pgapi_handler_field_transaction_operations.inc b/includes/views/handlers/pgapi_handler_field_transaction_operations.inc
index d263c6e..c7cfe4b 100644
--- a/includes/views/handlers/pgapi_handler_field_transaction_operations.inc
+++ b/includes/views/handlers/pgapi_handler_field_transaction_operations.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Contains field handler for all payment operations together.
+ */
+
+/**
  * Field handler to present a payment's operations links.
  */
 class pgapi_handler_field_transaction_operations extends views_handler_field {
diff --git a/includes/views/pgapi.views.inc b/includes/views/pgapi.views.inc
index a3d40e2..25013b4 100644
--- a/includes/views/pgapi.views.inc
+++ b/includes/views/pgapi.views.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Export PGAPI payments to Views
+ * Export PGAPI payments to Views
  */
 
 /**
diff --git a/includes/views/pgapi.views_default.inc b/includes/views/pgapi.views_default.inc
index 5b83810..7aad69a 100644
--- a/includes/views/pgapi.views_default.inc
+++ b/includes/views/pgapi.views_default.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Views for the default transactions UI.
+ * Views for the default transactions UI.
  */
 
 /**
diff --git a/pg_2co/pg_2co.admin.inc b/pg_2co/pg_2co.admin.inc
index 4735324..59f453d 100644
--- a/pg_2co/pg_2co.admin.inc
+++ b/pg_2co/pg_2co.admin.inc
@@ -56,6 +56,7 @@ function pg_2co_settings($form, &$form_state) {
     '#value' => t('Submit'),
   );
   $form['#validate'][] = 'pg_2co_settings_validate';
+
   return system_settings_form($form);
 }
 
diff --git a/pg_2co/pg_2co.module b/pg_2co/pg_2co.module
index e61043c..6d6c08c 100644
--- a/pg_2co/pg_2co.module
+++ b/pg_2co/pg_2co.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Module provides 2Checkout gateway implementation for PGAPI.
+ */
+
 // Define constants
 define("c2coActionUrlSingle", "https://www.2checkout.com/checkout/spurchase");
 define("c2coActionUrlMulti",  "https://www.2checkout.com/checkout/spurchase");
@@ -26,6 +31,7 @@ function pg_2co_menu() {
     'file' => 'pg_2co.admin.inc',
     'type' => MENU_LOCAL_TASK,
   );
+
   return $items;
 }
 
@@ -53,6 +59,7 @@ function pg_2co_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
     default:
       $ret = '';
   }
+
   return $ret;
 }
 
@@ -76,6 +83,7 @@ function pg_2co_extraform($form_state, $transaction) {
     '#type' => 'markup',
     '#value' => t('We will charge !amount from your CC', array('!amount' => round(($transaction->amount * variable_get('pg_2co_rate', '1.00')), 2))),
   );
+
   return $form;
 }
 
@@ -121,5 +129,6 @@ function pg_2co_payform($form, &$form_state, $transaction) {
   );
   $form['#attributes'] = array('name' => 'pgpayform');
   $form['#action'] = variable_get('pg_2co_action_url', c2coActionUrlSingle);
+
   return $form;
 }
diff --git a/pg_2co/pg_2co.pages.inc b/pg_2co/pg_2co.pages.inc
index a78aa55..3030fe0 100644
--- a/pg_2co/pg_2co.pages.inc
+++ b/pg_2co/pg_2co.pages.inc
@@ -2,7 +2,6 @@
 
 /*
  * @file
- * pg_2co.pages.inc
  * Page callbacks for 2co module
  */
 
@@ -59,4 +58,4 @@ function pg_2co_done_payment() {
   $transaction->description = $description;
   $transaction->status      = pgapi_get_status_id($status);
   pgapi_transaction_save($transaction);
-}
\ No newline at end of file
+}
diff --git a/pg_linkpoint/pg_linkpoint.admin.inc b/pg_linkpoint/pg_linkpoint.admin.inc
index 2c5495f..7929cd7 100644
--- a/pg_linkpoint/pg_linkpoint.admin.inc
+++ b/pg_linkpoint/pg_linkpoint.admin.inc
@@ -10,6 +10,7 @@
  */
 function pg_linkpoint_settings($form, &$form_state) {
   $form = array();
+
   $form['pg_linkpoint_action_url'] = array(
     '#type' => 'textfield',
     '#title' => t('Action url'),
@@ -68,6 +69,7 @@ function pg_linkpoint_settings($form, &$form_state) {
   );
   $form['#attributes']['enctype'] = 'multipart/form-data';
   $form['#submit'][] = 'pg_linkpoint_settings_submit';
+
   return system_settings_form($form);
 }
 
@@ -91,5 +93,3 @@ function pg_linkpoint_settings_submit($form, &$form_state) {
     variable_set('pg_linkpoint_transaction_key_fid', $file->fid);
   }
 }
-
-
diff --git a/pg_linkpoint/pg_linkpoint.module b/pg_linkpoint/pg_linkpoint.module
index e7f7c80..2da2271 100644
--- a/pg_linkpoint/pg_linkpoint.module
+++ b/pg_linkpoint/pg_linkpoint.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Module provides Linkpoint gateway implementation for PGAPI.
+ */
+
 // Define constants
 define("cLinkPointGAPIURL", "https://secure.linkpt.net:1129/LSGSXML");
 
@@ -8,6 +13,7 @@ define("cLinkPointGAPIURL", "https://secure.linkpt.net:1129/LSGSXML");
  */
 function pg_linkpoint_menu() {
   $items = array();
+
   $items['admin/pgdata/pgsettings/linkpoint'] = array(
     'title' => 'Linkpoint',
     'description' => 'Linkpoint payment settings.',
@@ -18,6 +24,7 @@ function pg_linkpoint_menu() {
     'file' => 'pg_linkpoint.admin.inc',
     'type' => MENU_LOCAL_TASK,
   );
+
   return $items;
 }
 
@@ -45,6 +52,7 @@ function pg_linkpoint_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
     default:
       $ret = '';
   }
+
   return $ret;
 }
 
@@ -90,6 +98,7 @@ function pg_linkpoint_extraform() {
     '#type' => 'textfield',
     '#title' => t('Security Code'),
   );
+
   return $form;
 }
 
@@ -211,5 +220,6 @@ function _pg_linkpoint_process_form($form_state, $t) {
   $t->description = $description;
   $t->status = pgapi_get_status_id($status);
   pgapi_transaction_save($t);
+
   return $t;
 }
diff --git a/pg_manual_payment/pg_manual_payment.admin.inc b/pg_manual_payment/pg_manual_payment.admin.inc
index 817920f..5f79597 100644
--- a/pg_manual_payment/pg_manual_payment.admin.inc
+++ b/pg_manual_payment/pg_manual_payment.admin.inc
@@ -37,6 +37,7 @@ function pg_manual_payment_list($form, &$form_state) {
       '#value' => t('Delete checked Accounts'),
     );
   }
+
   return $form;
 }
 
@@ -55,7 +56,6 @@ function pg_manual_payment_list_submit($form, &$form_state) {
   }
 }
 
-
 /**
  * Manual payment edit form
  */
@@ -98,6 +98,7 @@ function pg_manual_payment_edit($form, &$form_state, $paid) {
     '#type' => 'submit',
     '#value' => t('Save'),
   );
+
   return $form;
 }
 
@@ -155,6 +156,7 @@ function pg_manual_payment_add($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Add Account'),
   );
+
   return $form;
 }
 
@@ -178,5 +180,6 @@ function pg_manual_payment_settings($form, &$form_state) {
     '#description' => t("Please enter email address for receive a notify and warning messages."),
     '#required' => TRUE,
   );
+
   return system_settings_form($form);
 }
diff --git a/pg_manual_payment/pg_manual_payment.install b/pg_manual_payment/pg_manual_payment.install
index d871166..d858e27 100644
--- a/pg_manual_payment/pg_manual_payment.install
+++ b/pg_manual_payment/pg_manual_payment.install
@@ -55,5 +55,6 @@ function pg_manual_payment_schema() {
     ),
     'primary key' => array('paid'),
   );
+
   return $schema;
 }
diff --git a/pg_manual_payment/pg_manual_payment.module b/pg_manual_payment/pg_manual_payment.module
index 4b11b1f..ab80547 100644
--- a/pg_manual_payment/pg_manual_payment.module
+++ b/pg_manual_payment/pg_manual_payment.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Provides manual payment gateway for PGAPI.
+ * Module provides Manual gateway implementation for PGAPI.
  */
 
 /**
@@ -10,6 +10,7 @@
  */
 function pg_manual_payment_menu() {
   $items = array();
+
   $items['payment/manual_payment/%pgapi_transaction'] = array(
     'title' => 'Manual Payment',
     'page callback' => 'drupal_get_form',
@@ -58,6 +59,7 @@ function pg_manual_payment_menu() {
     'type' => MENU_LOCAL_TASK,
     'file' => 'pg_manual_payment.admin.inc',
   );
+
   return $items;
 }
 
@@ -69,6 +71,7 @@ function pg_manual_payment_mail($key, &$message, $params) {
   $language            = $message['language'];
   $transaction         = $params['transaction'];
   $account             = user_load($transaction->uid);
+
   if (!$language) {
     global $language;
   }
@@ -136,6 +139,7 @@ function pg_manual_payment_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
     default:
       $ret = '';
   }
+
   return $ret;
 }
 
@@ -171,6 +175,7 @@ function pg_manual_payment_extraform($form, &$form_state, $transaction) {
     '#default_value' => key($purses),
     '#description' => t('What type of currency will be used.'),
   );
+
   return $form;
 }
 
diff --git a/pg_manual_payment/pg_manual_payment.pages.inc b/pg_manual_payment/pg_manual_payment.pages.inc
index e7dcd77..7b5b62f 100644
--- a/pg_manual_payment/pg_manual_payment.pages.inc
+++ b/pg_manual_payment/pg_manual_payment.pages.inc
@@ -2,7 +2,6 @@
 
 /*
  * @file
- * pg_manual_payment.pages.inc
  * Page callbacks for Manual payment module
  */
 
@@ -11,6 +10,7 @@
  */
 function pg_manual_payment_payform($form, &$form_state, $transaction) {
   global $user;
+
   if ($user->uid != 1 && $user->uid != $transaction->uid) {
     drupal_access_denied();
   }
@@ -50,6 +50,7 @@ function pg_manual_payment_payform($form, &$form_state, $transaction) {
     '#type' => 'submit',
     '#value' => t('Submit'),
   );
+
   return $form;
 }
 
diff --git a/pg_paypal/pg_paypal.admin.inc b/pg_paypal/pg_paypal.admin.inc
index 280881e..b67bf57 100644
--- a/pg_paypal/pg_paypal.admin.inc
+++ b/pg_paypal/pg_paypal.admin.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_paypal.admin.inc
  * Admin interface for paypal pgapi module
  */
 
@@ -63,6 +62,7 @@ function pg_paypal_settings($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Submit paypal settings'),
   );
+
   return system_settings_form($form);
 }
 
diff --git a/pg_paypal/pg_paypal.module b/pg_paypal/pg_paypal.module
index 099351c..450c7aa 100644
--- a/pg_paypal/pg_paypal.module
+++ b/pg_paypal/pg_paypal.module
@@ -2,6 +2,7 @@
 
 /**
  * @file
+ * Module provides PayPal gateway implementation for PGAPI.
  */
 
 // Constant definition
@@ -29,6 +30,7 @@ function pg_paypal_menu() {
     'file' => 'pg_paypal.admin.inc',
     'type' => MENU_CALLBACK,
   );
+
   return $items;
 }
 
@@ -58,6 +60,7 @@ function pg_paypal_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
       $ret = _pg_paypal_process_form($transaction);
       break;
   }
+
   return $ret;
 }
 
@@ -80,6 +83,7 @@ function pg_paypal_extraform($form, &$form_state, $transaction) {
     '#type' => 'markup',
     '#value' => '<!-- -->',
   );
+
   return $form;
 }
 
@@ -149,5 +153,6 @@ function pg_paypal_payform($form, &$form_state,  $transaction) {
   );
   $form['#attributes'] = array('name' => 'pgpayform');
   $form['#action'] = variable_get('pg_paypal_action_url', cPaypalActionUrl);
+
   return $form;
 }
diff --git a/pg_paypal/pg_paypal.pages.inc b/pg_paypal/pg_paypal.pages.inc
index 44a3a60..1f022fc 100644
--- a/pg_paypal/pg_paypal.pages.inc
+++ b/pg_paypal/pg_paypal.pages.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_paypal.pages.inc
  * Page callbacks for Paypal module
  */
 
@@ -62,4 +61,4 @@ function pg_paypal_done_payment() {
   $transaction->description = $description;
   $transaction->status = pgapi_get_status_id($status);
   pgapi_transaction_save($transaction);
-}
\ No newline at end of file
+}
diff --git a/pg_rbkmoney/pg_rbkmoney.admin.inc b/pg_rbkmoney/pg_rbkmoney.admin.inc
index 0cdc777..51cceed 100644
--- a/pg_rbkmoney/pg_rbkmoney.admin.inc
+++ b/pg_rbkmoney/pg_rbkmoney.admin.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_rbkmoney.admin.inc
  * Admin interface for RBK money module
  */
 
@@ -47,5 +46,6 @@ function pg_rbkmoney_settings($form, &$form_state) {
     ),
     '#description' => t("Please select rbkmoney currency."),
   );
+
   return system_settings_form($form);
 }
diff --git a/pg_rbkmoney/pg_rbkmoney.module b/pg_rbkmoney/pg_rbkmoney.module
index 1603263..1d89149 100644
--- a/pg_rbkmoney/pg_rbkmoney.module
+++ b/pg_rbkmoney/pg_rbkmoney.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Module provides RBK Money gateway implementation for PGAPI.
+ */
+
 // Define constants
 define("crbkmoneyPayActionUrl", "https://rbkmoney.ru/acceptpurchase.aspx");
 
@@ -25,6 +30,7 @@ function pg_rbkmoney_menu() {
     'file' => 'pg_rbkmoney.admin.inc',
     'type' => MENU_LOCAL_TASK,
   );
+
   return $items;
 }
 
@@ -56,6 +62,7 @@ function pg_rbkmoney_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
     default:
       $ret = '';
   }
+
   return $ret;
 }
 
@@ -98,6 +105,7 @@ function pg_rbkmoney_extraform($form, &$form_state, $transaction) {
     '#default_value' => $default,
     '#attributes' => array('class' => 'rbk_method'),
   );
+
   return $form;
 }
 
@@ -118,6 +126,7 @@ function _pg_rbkmoney_process_form($form_result, $transaction) {
  */
 function pg_rbkmoney_payform($form, $form_state, $post, $transaction) {
   global $user;
+
   $rate = variable_get('pg_rbkmoney_rate', '1.00');
   $amount = round(($transaction->amount * $rate), 2);
 
@@ -167,6 +176,6 @@ function pg_rbkmoney_payform($form, $form_state, $post, $transaction) {
 
   $form['#attributes'] = array('name' => 'pgpayform');
   $form['#action'] = crbkmoneyPayActionUrl;
+
   return $form;
 }
-
diff --git a/pg_rbkmoney/pg_rbkmoney.pages.inc b/pg_rbkmoney/pg_rbkmoney.pages.inc
index 31066d4..edae5c3 100644
--- a/pg_rbkmoney/pg_rbkmoney.pages.inc
+++ b/pg_rbkmoney/pg_rbkmoney.pages.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_rbkmoney.pages.inc
  * Page callbacks for RBK money module
  */
 
@@ -55,4 +54,4 @@ function pg_rbkmoney_done_payment() {
     pgapi_transaction_save($transaction);
   }
   echo 'OK';
-}
\ No newline at end of file
+}
diff --git a/pg_roboxchange/pg_roboxchange.admin.inc b/pg_roboxchange/pg_roboxchange.admin.inc
index b002215..c6e63c8 100644
--- a/pg_roboxchange/pg_roboxchange.admin.inc
+++ b/pg_roboxchange/pg_roboxchange.admin.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_roboxchange.admin.inc
  * Admin interface for ROBOX module.
  */
 
@@ -126,6 +125,7 @@ function pg_roboxchange_settings($form, &$form_state) {
 
   $form['#validate'][] = 'pg_roboxchange_settings_validate';
   $form['#submit'][] = 'pg_roboxchange_settings_submit';
+
   return system_settings_form($form);
 }
 
diff --git a/pg_roboxchange/pg_roboxchange.install b/pg_roboxchange/pg_roboxchange.install
index 5153c31..1a2c4ce 100644
--- a/pg_roboxchange/pg_roboxchange.install
+++ b/pg_roboxchange/pg_roboxchange.install
@@ -49,5 +49,6 @@ function pg_roboxchange_schema() {
     ),
     'primary key' => array('type'),
   );
+
   return $schema;
 }
diff --git a/pg_roboxchange/pg_roboxchange.module b/pg_roboxchange/pg_roboxchange.module
index e4aa138..8dcf521 100644
--- a/pg_roboxchange/pg_roboxchange.module
+++ b/pg_roboxchange/pg_roboxchange.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Module provides RoboXchange gateway implementation for PGAPI.
+ */
+
 // Constants definition
 define('cRoboXchangeActionUrl', 'https://merchant.roboxchange.com/Index.aspx');
 define('cRoboXchangeRateUrl'  , 'https://merchant.roboxchange.com/WebService/Service.asmx/GetRates');
@@ -9,6 +14,7 @@ define('cRoboXchangeRateUrl'  , 'https://merchant.roboxchange.com/WebService/Ser
  */
 function pg_roboxchange_menu() {
   $items = array();
+
   $items['roboxchange/done'] = array(
     'title' => 'Internal Data',
     'page callback' => 'pg_roboxchange_done_payment',
@@ -134,7 +140,6 @@ function _pg_roboxchange_get_rates() {
         watchdog('pg_roboxchange', 'Robokassa updated %count items', array(
           '%count' => $number_items), WATCHDOG_INFO);
         break;
-
       default:
         // 2 - MerchantLogin is wrong.
         // 1000 - internal service error.
@@ -192,6 +197,7 @@ function pg_roboxchange_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
     default:
       $ret = '';
   }
+
   return $ret;
 }
 
@@ -244,6 +250,7 @@ function pg_roboxchange_extraform($form, $form_state, $transaction) {
     '#options' => $prices,
     '#default_value' => key($prices),
   );
+
   return $form;
 }
 
@@ -293,10 +300,10 @@ function pg_roboxchange_payform($form, $form_state, $post, $transaction) {
   */
   $form['#attributes'] = array('name' => 'pgpayform');
   $form['#action'] = variable_get('pg_roboxchange_action_url', cRoboXchangeActionUrl);
+
   return $form;
 }
 
-
 /**
  * Returns the URL to the specified Robokassa server.
  *
diff --git a/pg_roboxchange/pg_roboxchange.pages.inc b/pg_roboxchange/pg_roboxchange.pages.inc
index b51c9b2..b9e8e1e 100644
--- a/pg_roboxchange/pg_roboxchange.pages.inc
+++ b/pg_roboxchange/pg_roboxchange.pages.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_roboxchange.pages.inc
  * Page callbacks for robokassa module.
  */
 
diff --git a/pg_webmoney/pg_webmoney.admin.inc b/pg_webmoney/pg_webmoney.admin.inc
index 2cc7201..861606e 100644
--- a/pg_webmoney/pg_webmoney.admin.inc
+++ b/pg_webmoney/pg_webmoney.admin.inc
@@ -34,6 +34,7 @@ function pg_webmoney_list($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Delete checked Wallet'),
   );
+
   return $form;
 }
 
@@ -55,7 +56,6 @@ function pg_webmoney_list_submit($form, &$form_state) {
   pg_webmoney_cron();
 }
 
-
 /**
  * Return webmoney edit form
  */
@@ -81,6 +81,7 @@ function pg_webmoney_edit($form, &$form_state, $wmtype) {
     '#type' => 'submit',
     '#value' => t('Update Wallet'),
   );
+
   return $form;
 }
 
@@ -129,6 +130,7 @@ function pg_webmoney_add($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Add Wallet'),
   );
+
   return $form;
 }
 
@@ -213,6 +215,7 @@ function pg_webmoney_settings($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Submit'),
   );
+
   return $form;
 }
 
@@ -250,6 +253,7 @@ function pg_webmoney_settings_submit($form, &$form_state) {
  */
 function pg_webmoney_example($purse = NULL) {
   $pursed = db_query('SELECT * FROM {pg_webmoney_rates} WHERE purse = :purse', array(':purse' => $purse))->fetchObject();
+
   return theme('pg_webmoney_example', array(
     'purse' => $pursed->purse,
     'tradename' => variable_get('site_name', 'Drupal'),
diff --git a/pg_webmoney/pg_webmoney.install b/pg_webmoney/pg_webmoney.install
index 8c6ef3a..9d1afa4 100644
--- a/pg_webmoney/pg_webmoney.install
+++ b/pg_webmoney/pg_webmoney.install
@@ -50,13 +50,15 @@ function pg_webmoney_schema() {
     ),
     'primary key' => array('type'),
   );
+
   return $schema;
 }
 
 /**
  * Implements hook_update_N().
+ *
+ * @todo Fix update function
  */
 function pg_webmoney_update_0001() {
-  // TODO: fix update function
   db_change_field('rate', 'rate', array('type' => 'numeric', 'size' => 'normal', 'precision' => 6, 'scale' => 4, 'default' => 0));
 }
diff --git a/pg_webmoney/pg_webmoney.module b/pg_webmoney/pg_webmoney.module
index 116f0bf..958e4b4 100644
--- a/pg_webmoney/pg_webmoney.module
+++ b/pg_webmoney/pg_webmoney.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Module provides webmoney gateway implementation for pgapi.
+ * Module provides Webmoney gateway implementation for pgapi.
  */
 
 // Constant definitions
@@ -140,7 +140,6 @@ function pg_webmoney_menu() {
   return $items;
 }
 
-
 /**
  * Implements hook_cron().
  */
@@ -199,7 +198,6 @@ function pg_webmoney_cron() {
     ->execute();
 }
 
-
 function pg_webmoney_pgapi_gw_info() {
   return;
 }
@@ -241,6 +239,7 @@ function pg_webmoney_pgapi_gw($op, $a3 = NULL, $a4 = NULL) {
     default:
       $ret = '';
   }
+
   return $ret;
 }
 
@@ -276,6 +275,7 @@ function pg_webmoney_extraform($form_state, $transaction) {
     '#options' => $purses,
     '#default_value' => key($purses),
   );
+
   return $form;
 }
 
@@ -296,6 +296,7 @@ function _pg_webmoney_process_form($form_result, $transaction) {
  */
 function pg_webmoney_payform($form, $form_state, $post, $transaction) {
   global $user;
+
   $wallet = db_query('SELECT * FROM {pg_webmoney_rates} WHERE type = :type', array(':type' => $post['wallet']))->fetchObject();
   $form['LMI_PAYEE_PURSE'] = array(
     '#type' => 'hidden',
@@ -315,6 +316,7 @@ function pg_webmoney_payform($form, $form_state, $post, $transaction) {
   );
   $form['#attributes'] = array('name' => 'pgpayform');
   $form['#action'] = cWebMoneyPayActionUrl;
+
   return $form;
 }
 
@@ -323,6 +325,7 @@ function pg_webmoney_payform($form, $form_state, $post, $transaction) {
  */
 function pg_webmoney_get_rate($type) {
   require_once DRUPAL_ROOT . '/' . 'XML/Unserializer.php';
+
   $unserializer_options = array(
     'parseAttributes' => TRUE,
   );
@@ -352,6 +355,6 @@ function pg_webmoney_get_rate($type) {
   else {
     $rate = variable_get('pg_webmoney_rate_wm', '1.00') / $rate;
   }
+
   return $rate;
 }
-
diff --git a/pg_webmoney/pg_webmoney.pages.inc b/pg_webmoney/pg_webmoney.pages.inc
index 0540304..fb9dff7 100644
--- a/pg_webmoney/pg_webmoney.pages.inc
+++ b/pg_webmoney/pg_webmoney.pages.inc
@@ -1,8 +1,7 @@
 <?php
 
-/*
+/**
  * @file
- * pg_webmoney.pages.inc
  * Page callbacks for Webmoney module
  */
 
@@ -63,6 +62,7 @@ function pg_webmoney_done_payment() {
     }
     pgapi_transaction_save($transaction);
   }
+
   echo $result;
 }
 
@@ -71,8 +71,9 @@ function pg_webmoney_done_payment() {
  */
 function pg_webmoney_payment_end($type) {
   global $user;
+
   $txnid = $_POST['LMI_PAYMENT_NO'];
   $transaction = pgapi_transaction_load($txnid);
   $url = pgapi_get_redirect_url($transaction);
   drupal_goto($url);
-}
\ No newline at end of file
+}
diff --git a/pg_webmoney/pg_webmoney.theme.inc b/pg_webmoney/pg_webmoney.theme.inc
index 3cd0203..f083f0a 100644
--- a/pg_webmoney/pg_webmoney.theme.inc
+++ b/pg_webmoney/pg_webmoney.theme.inc
@@ -29,8 +29,9 @@ function theme_pg_webmoney_list($variables) {
       $rows[] = $row;
     }
   }
-  
+
   $output = theme('table', array('header' => $header, 'rows' => $rows));
   $output .= drupal_render_children($form);
+
   return $output;
 }
diff --git a/pgapi.admin.inc b/pgapi.admin.inc
index aaeae54..b748169 100644
--- a/pgapi.admin.inc
+++ b/pgapi.admin.inc
@@ -17,6 +17,7 @@ function pgapi_admin_menu_block_page() {
   else {
     $output = t('You do not have any administrative items.');
   }
+
   return $output;
 }
 
diff --git a/pgapi.css b/pgapi.css
index 1fba751..64fcd32 100644
--- a/pgapi.css
+++ b/pgapi.css
@@ -1,5 +1,8 @@
 /**
  * @file
+ * Styles for UI of Payment Gateway API module.
+ *
+ * Optimized for the Seven administration theme.
  */
 
 .price .symbol {
diff --git a/pgapi.install b/pgapi.install
index 17849be..bd635b7 100644
--- a/pgapi.install
+++ b/pgapi.install
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Install and unistall functions for PGAPI module
+ * Install and unistall functions for PGAPI module
  */
 
 /**
@@ -95,6 +95,7 @@ function pgapi_schema() {
     'indexes' => array('uid' => array('uid')),
     'primary key' => array('txnid'),
   );
+
   return $schema;
 }
 
diff --git a/pgapi.module b/pgapi.module
index 394a776..2225ca2 100644
--- a/pgapi.module
+++ b/pgapi.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Define features and function common to the PGAPI module.
+ */
+
 // No payment information has been recieved.
 define('PG_PENDING', 1);
 
@@ -253,6 +258,7 @@ function pgapi_format_price($module, $price, $symbol) {
     $formated_price = number_format($price, 2, '.', ',');
     $formated = theme('pgapi_format_price', array('price' => $formated_price, 'symbol' => $symbol, 'position' => TRUE));
   }
+
   return $formated;
 }
 
@@ -279,6 +285,7 @@ function pgapi_format_price_plain($module, $price, $symbol) {
     $formated_price = number_format($price, 2, '.', ',');
     $formated = theme('pgapi_format_price_plain', array('price' => $formated_price, 'symbol' => $symbol, 'position' => TRUE));
   }
+
   return $formated;
 }
 
@@ -296,9 +303,10 @@ function pgapi_get_redirect_url($transaction) {
 
 /**
  * Returns array with enabled payment systems.
+ *
+ * @todo Check - Enable domain module support.
  */
 function pgapi_get_enabled_payment_systems() {
-  // @todo: Check - Enable domain module support.
   if (module_exists('domain_conf')) {
     $current_domain = domain_get_domain();
     $pgapi_gw = domain_conf_variable_get($current_domain['domain_id'], 'pgapi_gw', array());
@@ -306,6 +314,7 @@ function pgapi_get_enabled_payment_systems() {
   else {
     $pgapi_gw = variable_get('pgapi_gw', array());
   }
+
   return $pgapi_gw;
 }
 
@@ -320,6 +329,7 @@ function pgapi_get_enabled_payment_systems() {
  */
 function pgapi_transaction_save(&$transaction) {
   global $user;
+
   $time = REQUEST_TIME;
   $transaction->is_new = FALSE;
 
@@ -437,6 +447,7 @@ function pgapi_transaction_delete($txnid) {
  */
 function pgapi_get_gateway_options() {
   $methods = array();
+
   // Get all hook_pgapi_gw() implementations.
   $implementations = module_implements('pgapi_gw');
   foreach ($implementations as $module) {
@@ -444,6 +455,7 @@ function pgapi_get_gateway_options() {
       $methods[$module] = $module_name;
     }
   }
+
   return $methods;
 }
 
@@ -463,7 +475,8 @@ function pgapi_get_gateway_name($module) {
  *
  * Add hook_pgapi_transaction_status()
  *
- * @return array
+ * @return
+ *   Return array with all statuses
  */
 function pgapi_build_status() {
   $status = array(
@@ -480,7 +493,7 @@ function pgapi_build_status() {
   foreach ($implementations as $module) {
     module_invoke($module, 'pgapi_transaction_status', $status);
   }
-  // Return array with all statuses
+
   return $status;
 }
 
@@ -497,6 +510,7 @@ function pgapi_get_status($id) {
   if ($status[$id]) {
     return $status[$id];
   }
+
   return t('undefined status');
 }
 
@@ -512,9 +526,11 @@ function pgapi_get_status_id($name) {
   $name = drupal_strtolower(t($name));
   $statuses = pgapi_build_status();
   $status_id = array_search($name, $statuses);
+
   if ($status_id) {
     return $status_id;
   }
+
   return 0;
 }
 
@@ -523,7 +539,8 @@ function pgapi_get_status_id($name) {
  *
  * Add hook_pgapi_transaction_workflow()
  *
- * @return array
+ * @return
+ *   Return array with all workflows
  */
 function pgapi_build_workflow() {
   $workflow = array(
@@ -540,7 +557,7 @@ function pgapi_build_workflow() {
   foreach ($implementations as $module) {
     module_invoke($module, 'pgapi_transaction_workflow', $workflow);
   }
-  // Return array with all workflows
+
   return $workflow;
 }
 
@@ -554,9 +571,11 @@ function pgapi_build_workflow() {
  */
 function pgapi_get_workflow($id) {
   $workflow = pgapi_build_workflow();
+
   if ($workflow[$id]) {
     return $workflow[$id];
   }
+
   return t('undefined workflow');
 }
 
@@ -572,8 +591,10 @@ function pgapi_get_workflow_id($name) {
   $name = drupal_strtolower(t($name));
   $statuses = pgapi_build_workflow();
   $status_id = array_search($name, $statuses);
+
   if ($status_id) {
     return $status_id;
   }
+
   return 0;
 }
diff --git a/pgapi.pages.inc b/pgapi.pages.inc
index 8a91550..5386f1d 100644
--- a/pgapi.pages.inc
+++ b/pgapi.pages.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Provides page callbacks for menu
+ * Provides page callbacks for menu
  */
 
 /**
diff --git a/pgapi.theme.inc b/pgapi.theme.inc
index d602c40..44dd96f 100644
--- a/pgapi.theme.inc
+++ b/pgapi.theme.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Provides theme functions for pgapi module.
+ * Provides theme functions for pgapi module.
  */
 
 /**
@@ -45,6 +45,7 @@ function theme_pgapi_payment($variables) {
     'empty' => t('No payment gateway available.'),
   ));
   $output .= drupal_render_children($form);
+
   return $output;
 }
 
@@ -72,6 +73,7 @@ function theme_pgapi_gateway_price($variables) {
       }
     }
   }
+
   return $output;
 }
 
@@ -90,12 +92,14 @@ function theme_pgapi_format_price($variables) {
   $price = $variables['price'];
   $symbol = $variables['symbol'];
   $position = $variables['position'];
+
   if ($position) {
     $output = '<div class="price"><span class="symbol">' . $symbol . '</span> ' . $price . '</div>';
   }
   else {
     $output = '<div class="price">' . $price . '<span class="symbol">' . $symbol . '</span></div>';
   }
+
   return $output;
 }
 
@@ -121,5 +125,6 @@ function theme_pgapi_format_price_plain($variables) {
   else {
     $output = $price . ' ' . $symbol;
   }
+
   return $output;
 }