diff --git a/README.txt b/README.txt
index 371aadf..39a2aa7 100644
--- a/README.txt
+++ b/README.txt
@@ -18,4 +18,3 @@ Installation and Configuration
  * The administrative user interface can be found at 
    http://yoursite.com/admin/config/people/username_policy
  * Visit http://yoursite.com/admin/help/username_policy for help.
-
diff --git a/username_policy.inc b/username_policy.inc
index 9d419e1..ab09df6 100644
--- a/username_policy.inc
+++ b/username_policy.inc
@@ -42,7 +42,7 @@ function username_policy_admin_form($form, &$form_state) {
     '#tree' => TRUE,
     '#theme' => 'username_policy_pattern_elements',
   );
-  foreach (generate_pattern_fields() as $field_name => $pattern_ele) {
+  foreach (username_policy_generate_pattern_fields() as $pattern_ele) {
     $form['username_policy']['token_tree'][] = array(
       '#markup' => $pattern_ele,
     );
@@ -54,7 +54,7 @@ function username_policy_admin_form($form, &$form_state) {
 /**
  * Generate pattern fields.
  */
-function generate_pattern_fields() {
+function username_policy_generate_pattern_fields() {
   $fieldinfo = field_info_instances('user', 'user');
   // Prepare pattern elements from user main profile.
   $_fields = array();
@@ -100,7 +100,7 @@ function generate_pattern_fields() {
  * Implements hook_form_validate().
  */
 function username_policy_admin_form_validate($form_id, $form_state) {
-  $pattern = $form_state['input']['pattern'];
+  $pattern = $form_state['values']['pattern'];
   $offset = 0;
   $not_found = array();
   $num_of_patterns = substr_count($pattern, '[');
@@ -115,7 +115,7 @@ function username_policy_admin_form_validate($form_id, $form_state) {
     }
   }
   if (count($not_found)) {
-    form_set_error('username_policy_pattern_error', 'These are non exist pattern sets!');
+    form_set_error('username_policy_pattern_error', t('These are non exist pattern sets!'));
   }
 }
 
diff --git a/username_policy.module b/username_policy.module
index 12099f6..4e8aefc 100644
--- a/username_policy.module
+++ b/username_policy.module
@@ -66,14 +66,14 @@ function username_policy_form_validate($form, $form_state) {
  * Implements hook_form_submit().
  */
 function username_policy_form_submit($form, $form_state) {
-  $form_state['values'] = generate_username_for_pattern($form_state['values']);
+  $form_state['values'] = username_policy_generate__pattern($form_state['values']);
   user_register_submit($form, $form_state);
 }
 
 /**
  * Generate username according to the given pattern.
  */
-function generate_username_for_pattern($form_state_values) {
+function username_policy_generate_pattern($form_state_values) {
   // Add caching for getting username policy pattern.
   $pattern = '';
   $cache_id = "cache:variable_get:username_policy_pattern";
@@ -156,8 +156,12 @@ function username_policy_theme() {
 
 /**
  * Implement theme for username_policy_pattern_elements.
- * @param vars
- * @return themed table with data
+ *
+ * @param $vars
+ *   An array of variable.
+ *
+ * @return string
+ *   Themed tabular format.
  */
 function theme_username_policy_pattern_elements($vars) {
   $element = $vars['pattern'];