diff --git a/README.txt b/README.txt
index 658c4e0..619533e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,13 +1,17 @@
 -- SUMMARY --
 
-Chosen uses the Chosen jQuery plugin to make your <select> elements more user-friendly.
+Chosen uses the Chosen jQuery plugin to make your <select>
+elements more user-friendly.
 
 
 -- INSTALLATION --
 
-  1. Download the Chosen jQuery plugin (http://harvesthq.github.io/chosen/ version 1.1.0 is recommended) and extract the file under sites/all/libraries.
+  1. Download the Chosen jQuery plugin
+  (http://harvesthq.github.io/chosen/ version 1.1.0 is recommended)
+  and extract the file under sites/all/libraries.
   2. Download and enable the module.
-  3. Configure at Administer > Configuration > User interface > Chosen (requires administer site configuration permission)
+  3. Configure at Administer > Configuration >
+  User interface > Chosen (requires administer site configuration permission)
 
 -- INSTALLATION VIA DRUSH --
 
@@ -29,4 +33,5 @@ There are accessibility problems with the main library as identified here:
   How to exlude a select field from becoming a chosen select.
     - go to the configuration page and add your field using the jquery "not"
       operator to the textarea with the comma seperated values.
-      For date fields this could look like: select:not([name*='day'],[name*='year'],[name*='month'])
+      For date fields this could look like:
+      select:not([name*='day'],[name*='year'],[name*='month'])
diff --git a/chosen.admin.inc b/chosen.admin.inc
index 15585da..8fbbf80 100644
--- a/chosen.admin.inc
+++ b/chosen.admin.inc
@@ -13,7 +13,10 @@ function chosen_admin_settings($form, &$form_state) {
   $chosen_path = chosen_get_chosen_path();
   if (!$chosen_path) {
     drupal_set_message(t('The library could not be detected. You need to download the !chosen and extract the entire contents of the archive into the %path directory on your server.',
-    array('!chosen' => l(t('Chosen JavaScript file'), CHOSEN_WEBSITE_URL), '%path' => 'sites/all/libraries')
+      array(
+        '!chosen' => l(t('Chosen JavaScript file'), CHOSEN_WEBSITE_URL),
+        '%path' => 'sites/all/libraries',
+      )
     ), 'error');
     return;
   }
@@ -134,7 +137,7 @@ function chosen_admin_settings($form, &$form_state) {
 }
 
 /**
- * Helper function to get options for enabled themes
+ * Helper function to get options for enabled themes.
  */
 function _chosen_enabled_themes_options() {
   $options = array();
@@ -143,7 +146,7 @@ function _chosen_enabled_themes_options() {
   $themes = list_themes();
 
   foreach ($themes as $theme) {
-    // Only create options for enabled themes
+    // Only create options for enabled themes.
     if ($theme->status) {
       $options[$theme->name] = $theme->info['name'];
     }
diff --git a/chosen.install b/chosen.install
index 8118ac5..2faec72 100644
--- a/chosen.install
+++ b/chosen.install
@@ -12,13 +12,15 @@ function chosen_requirements($phase) {
   module_load_include('module', 'chosen');
   $t = get_t();
   $chosen_path = chosen_get_chosen_path();
-  switch($phase) {
+  switch ($phase) {
     case 'runtime':
       if (!$chosen_path) {
         $requirements['chosen_js'] = array(
           'title' => $t('Chosen JavaScript file'),
           'severity' => REQUIREMENT_ERROR,
-          'description' => $t('You need to download the !chosen and extract the entire contents of the archive into the %path directory on your server.', array('!chosen' => l($t('Chosen JavaScript file'), CHOSEN_WEBSITE_URL), '%path' => 'sites/all/libraries')),
+          'description' => $t('You need to download the !chosen and extract the entire contents of the archive into the %path directory on your server.', array(
+            '!chosen' => l($t('Chosen JavaScript file'), CHOSEN_WEBSITE_URL),
+            '%path' => 'sites/all/libraries')),
           'value' => $t('Not Installed'),
         );
       }
@@ -29,8 +31,8 @@ function chosen_requirements($phase) {
           'value' => $t('Installed'),
         );
       }
-    break;
-   }
+      break;
+  }
   return $requirements;
 }
 
@@ -55,6 +57,8 @@ function chosen_uninstall() {
 }
 
 /**
+ * Implements hook_update_N().
+ *
  * Transfer the old chosen minimum value to the new chosen minimum single and
  * chosen minimum multiple variables.
  */
@@ -83,7 +87,10 @@ function chosen_update_7202() {
 }
 
 /**
- * Update any option_select widgets with an empty Chosen setting to the 'No preference' Chosen setting.
+ * Implements hook_update_N().
+ *
+ * Update any option_select widgets with an empty Chosen setting
+ * to the 'No preference' Chosen setting.
  */
 function chosen_update_7203() {
   $field_names = db_query("SELECT field_name FROM {field_config_instance} WHERE data LIKE :widget", array(':widget' => '%' . db_like('options_select') . '%' . db_like('apply_chosen') . '%'))->fetchCol();
@@ -101,19 +108,24 @@ function chosen_update_7203() {
 }
 
 /**
- * Set the 'Disable the default Chosen theme' Chosen setting to the opposite of the current general 'Use the default chosen theme' Chosen setting for all enabled themes
+ * Implements hook_update_N().
+ *
+ * Set the 'Disable the default Chosen theme' Chosen setting to the opposite
+ * of the current general'Use the default chosen theme'
+ * Chosen setting for all enabled themes.
  */
 function chosen_update_7204() {
   module_load_include('inc', 'chosen', 'chosen.admin');
 
   $chosen_use_theme_setting = variable_get('chosen_use_theme', TRUE);
 
-  // We now chose to disable the default Chosen CSS instead of deselecting the 'Use the default chosen theme' option box
+  // We now chose to disable the default Chosen CSS instead of deselecting
+  // the 'Use the default chosen theme' option box.
   if (!$chosen_use_theme_setting) {
     $themes = system_list('theme');
 
     foreach ($themes as $theme) {
-      // Only create options for enabled themes
+      // Only create options for enabled themes.
       if ($theme->status) {
         $options[$theme->name] = $theme->info['name'];
       }
@@ -122,6 +134,6 @@ function chosen_update_7204() {
     variable_set('chosen_disabled_themes', array_keys($options));
   }
 
-  // Delete the old variable
+  // Delete the old variable.
   variable_del('chosen_use_theme');
 }
diff --git a/chosen.js b/chosen.js
index 74c3e50..e0a6406 100644
--- a/chosen.js
+++ b/chosen.js
@@ -1,3 +1,8 @@
+/**
+ * @file
+ * Attaches behaviors for the Chosen module.
+ */
+
 (function($) {
   Drupal.behaviors.chosen = {
     attach: function(context, settings) {
@@ -43,7 +48,7 @@
         // - WYSIWYG elements
         // - Tabledrag weights
         // - Elements that have opted-out of Chosen
-        // - Elements already processed by Chosen
+        // - Elements already processed by Chosen.
         .not('#field-ui-field-overview-form select, #field-ui-display-overview-form select, .wysiwyg, .draggable select[name$="[weight]"], .draggable select[name$="[position]"], .chosen-disable, .chosen-processed')
         .filter(function() {
           // Filter out select widgets that do not meet the minimum number of
diff --git a/chosen.module b/chosen.module
index 752d606..0b792e8 100644
--- a/chosen.module
+++ b/chosen.module
@@ -8,7 +8,7 @@
  */
 
 /**
- * Define chosen library url
+ * Define chosen library url.
  */
 define('CHOSEN_WEBSITE_URL', 'http://harvesthq.github.io/chosen');
 define('CHOSEN_INCLUDE_ADMIN', 0);
@@ -107,7 +107,7 @@ function chosen_library() {
 
   $css_disabled_themes = variable_get('chosen_disabled_themes', array());
 
-  // Only add the Chosen CSS if it is not disabled for the active theme
+  // Only add the Chosen CSS if it is not disabled for the active theme.
   if (!in_array($theme, $css_disabled_themes, TRUE)) {
     $info['chosen']['css'] = array($library_path . '/chosen.css' => array());
   }
@@ -226,7 +226,7 @@ function chosen_pre_render_select($element) {
   }
 
   // Right to Left Support.
-  if($language->direction == 1) {
+  if ($language->direction == 1) {
     $element['#attributes']['class'][] = 'chosen-rtl';
   }
 
@@ -279,7 +279,7 @@ function chosen_element_apply_property_recursive(array &$element, $chosen_value
 /**
  * Get the location of the chosen library.
  *
- * @return
+ * @return mixed
  *   The location of the library, or FALSE if the library isn't installed.
  */
 function chosen_get_chosen_path() {
diff --git a/drush/chosen.drush.inc b/drush/chosen.drush.inc
index 84b2024..1d46c75 100644
--- a/drush/chosen.drush.inc
+++ b/drush/chosen.drush.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   drush integration for chosen.
+ * Drush integration for chosen.
  */
 
 /**
@@ -11,7 +11,7 @@
 define('CHOSEN_DOWNLOAD_URI', 'https://github.com/harvesthq/chosen/releases/download/v1.1.0/chosen_v1.1.0.zip');
 
 /**
- * Implementation of hook_drush_command().
+ * Implements hook_drush_command().
  *
  * In this hook, you specify which commands your
  * drush module makes available, what it does and
@@ -21,9 +21,6 @@ define('CHOSEN_DOWNLOAD_URI', 'https://github.com/harvesthq/chosen/releases/down
  * you define menu hooks.
  *
  * See `drush topic docs-commands` for a list of recognized keys.
- *
- * @return
- *   An associative array describing your command(s).
  */
 function chosen_drush_command() {
   $items = array();
@@ -32,7 +29,8 @@ function chosen_drush_command() {
   $items['chosen-plugin'] = array(
     'callback' => 'drush_chosen_plugin',
     'description' => dt('Download and install the Chosen plugin.'),
-    'bootstrap' => DRUSH_BOOTSTRAP_DRUSH, // No bootstrap.
+    // No bootstrap.
+    'bootstrap' => DRUSH_BOOTSTRAP_DRUSH,
     'arguments' => array(
       'path' => dt('Optional. A path where to install the Chosen plugin. If omitted Drush will use the default location.'),
     ),
@@ -43,16 +41,10 @@ function chosen_drush_command() {
 }
 
 /**
- * Implementation of hook_drush_help().
+ * Implements hook_drush_help().
  *
  * This function is called whenever a drush user calls
  * 'drush help <name-of-your-command>'.
- *
- * @param
- *   A string with the help section (prepend with 'drush:').
- *
- * @return
- *   A string with the help text for your command.
  */
 function chosen_drush_help($section) {
   switch ($section) {
@@ -86,7 +78,7 @@ function drush_chosen_plugin() {
   // Download the zip archive.
   if ($filepath = drush_download_file(CHOSEN_DOWNLOAD_URI)) {
     $filename = basename($filepath);
-    $dirname =  basename($filepath, '.zip');
+    $dirname = basename($filepath, '.zip');
 
     // Remove any existing Chosen plugin directory.
     if (is_dir($dirname) || is_dir('chosen')) {