diff --git a/vimrc.drush.inc b/vimrc.drush.inc
index 71566c9..d529c02 100644
--- a/vimrc.drush.inc
+++ b/vimrc.drush.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   Drush tools to support the vimrc project.
+ * Drush tools to support the vimrc project.
  */
 
 /**
@@ -13,8 +13,7 @@ function vimrc_drush_command() {
 
   $items['vimrc-install'] = array(
     'description' => 'Install the vim plugin for Drupal (vimrc project).',
-    'arguments' => array(
-    ),
+    'arguments' => array(),
     'options' => array(
       'vim-command' => 'Command used to invoke vim (defaults to vim).',
       'vimfiles' => 'Path to vimfiles directory (defaults to $HOME/.vim, or $HOME/vimfiles on Windows).',
@@ -65,9 +64,9 @@ function drush_vimrc_install_validate() {
   $error = '';
   // This works only if $vim is a full path.
   // if (!is_executable($vim)) {
-  //   $error = dt('The command %vim is not executable.', array('%vim' => $vim));
+  // $error = dt('The command %vim is not executable.', array('%vim' => $vim));
   // }
-  // else {
+  // else {.
   $success = drush_shell_exec('%s --version', $vim);
   $output = drush_shell_exec_output();
   if (!$success) {
@@ -82,7 +81,7 @@ function drush_vimrc_install_validate() {
     $error = dt('The vimrc project requires vim 7.0 or later (7.3+ recommended).',
       array('%vim' => $vim));
   }
-  // }
+  // }.
   if ($error) {
     $error .= "\n" . dt('See !url for how to install vim.',
       array('!url' => 'http://www.vim.org/download.php'));
@@ -106,11 +105,11 @@ function drush_vimrc_install_validate() {
     $vimfiles = drush_get_option('vimfiles', _vimrc_vimfiles_default());
     if (!is_dir($vimfiles) && !mkdir($vimfiles, 0777, TRUE)) {
       $error = dt('Cannot create the vimfiles directory %vimfiles. Specify another directory with --vimfiles.',
-	array('%vimfiles' => $vimfiles));
+      array('%vimfiles' => $vimfiles));
     }
     elseif (!is_writable($vimfiles)) {
       $error = dt('Installation requires write access to the vimfiles directory %vimfiles. Specify another directory with --vimfiles.',
-	array('%vimfiles' => $vimfiles));
+      array('%vimfiles' => $vimfiles));
     }
   }
   if ($error) {
@@ -122,23 +121,23 @@ function drush_vimrc_install_validate() {
  * Return the default vimfiles directory, depending on the OS.
  */
 function _vimrc_vimfiles_default() {
-    return drush_server_home() . (drush_is_windows() ?  '/vimfiles' : '/.vim');
+  return drush_server_home() . (drush_is_windows() ? '/vimfiles' : '/.vim');
 }
 
 /**
  * Return the default vimrc file, depending on the OS.
  */
 function _vimrc_vimrc_default() {
-    return drush_server_home() . (drush_is_windows() ?  '/_vimrc' : '/.vimrc');
+  return drush_server_home() . (drush_is_windows() ? '/_vimrc' : '/.vimrc');
 }
 
 /**
  * Check whether the pathogen plugin is installed.
  *
  * @return mixed
- * - FALSE if not installed
- * - version string if it can be determined, such as '2.0'
- * - TRUE if installed but cannot determine version string
+ *   - FALSE if not installed
+ *   - version string if it can be determined, such as '2.0'
+ *   - TRUE if installed but cannot determine version string
  */
 function _vimrc_check_pathogen($vim) {
   $lines = vimrc_vim_command($vim, '2verbose runtime autoload/pathogen.vim', TRUE);
@@ -168,15 +167,15 @@ function _vimrc_check_pathogen($vim) {
  *
  * Example: $versionstring = vimrc_vim_command('/usr/local/bin/vim', 'version')
  *
- * @param String $vim
+ * @param string $vim
  *   The name of the vim executable.
- * @param String $command
+ * @param string $command
  *   The vim command to execute.
- * @param Boolean $implode
+ * @param bool $implode
  *   If TRUE, then return a single string instead of an array.
  *   (optional, default FALSE)
  *
- * @return Array
+ * @return array
  *   The output of $command as an array of strings or FALSE on error.
  */
 function vimrc_vim_command($vim, $command, $implode = FALSE) {
@@ -194,18 +193,18 @@ function vimrc_vim_command($vim, $command, $implode = FALSE) {
  *
  * The calling function is reponsible for validating that $vim is executable.
  *
- * @param String $vim
+ * @param string $vim
  *   The name of the vim executable.
- * @param Array $commands
+ * @param array $commands
  *   The vim commands to execute.
- * @param Boolean $implode
+ * @param bool $implode
  *   If TRUE, then return a single string instead of an array.
  *   (optional, default FALSE)
  *
- * @return Array
+ * @return array
  *   The output of $command as an array of strings or FALSE on error.
  */
-function vimrc_vim_commands($vim, $commands, $implode = FALSE) {
+function vimrc_vim_commands($vim, array $commands, $implode = FALSE) {
   $command = implode("\n", $commands);
   return vimrc_vim_command($vim, $command, $implode);
 }
@@ -224,7 +223,8 @@ function drush_vimrc_install($path = '.') {
   else {
     // Pathogen is not installed, but the validate function already checked
     // that we can write to the vimfiles directory. Start by downloading
-    // pathogen.  See https://github.com/tpope/vim-pathogen.
+    // pathogen.
+    // @see https://github.com/tpope/vim-pathogen
     if (!file_exists("$vimfiles/autoload")) {
       drush_log(dt('Creating directory %autoload.',
         array('%autoload' => "$vimfiles/autoload")));
@@ -245,8 +245,8 @@ function drush_vimrc_install($path = '.') {
   // 2. Tell pathogen about the files in this project.
   // 3. Tell pathogen about the plugins in $vimfiles/bundle.
   // Why do I get a message that __DIR__ is undefined?
-  $DIR = dirname(__FILE__);
-  $vimrcbundle = realpath("$DIR/bundle");
+  $dir = dirname(__FILE__);
+  $vimrcbundle = realpath("$dir/bundle");
   $bundle = "$vimfiles/bundle";
   // Avoid E_STRICT and E_WARNING messages from date().
   date_default_timezone_set('UTC');
@@ -308,7 +308,7 @@ function drush_vimrc_install($path = '.') {
 
   // Update the help tags, using the pathogen variant of :helptags.
   drush_log(dt('Updating help tags.', array()));
-  $vimrclines[] =  'call pathogen#helptags()';
+  $vimrclines[] = 'call pathogen#helptags()';
   drush_op('vimrc_vim_commands', $vim, $vimrclines);
 
   return;
@@ -323,19 +323,19 @@ function drush_vimrc_install($path = '.') {
  *
  * @todo For now, the function ignores the 'description' and 'git uri' keys.
  *
- * @param String $vim
+ * @param string $vim
  *   The name of the vim executable. The calling function is reponsible for
  *   validating that $vim is executable.
- * @param String $vimrc
+ * @param string $vimrc
  *   Path to vimrc file. It must be writable.
- * @param String $bundle
+ * @param string $bundle
  *   Path to the bundle directory, such as ~/.vim/bundle. The calling function
  *   is responsible for making sure that this directory is writable.
- * @param Boolean $update
+ * @param bool $update
  *   (optional, default FALSE) If TRUE, then skip the check for whether the
  *   plugin is already installed. For now, the function does not check for other
  *   locations, it will just download to $bundle, overwriting the version there.
- * @param Array $plugins
+ * @param array $plugins
  *   (optional) An array of associative arrays describing the plugins to
  *   download. The keys are the subdirectories of $bundle where the plugins will
  *   be downloaded. Each array should have the keys
@@ -348,14 +348,15 @@ function drush_vimrc_install($path = '.') {
  *   - 'git uri': URI to use if downloading with git (optional)
  *   If $plugins is omitted or empty, then use the default list.
  *
- * @return Array
+ * @return array
  *   An array of paths to the installed plugins, using the same keys as
  *   $plugins. If there is a problem with a plugin, then the value will be ''.
  */
-function vimrc_download_plugins($vim, $vimrc, $bundle, $update = FALSE, $plugins = array()) {
+function vimrc_download_plugins($vim, $vimrc, $bundle, $update = FALSE, array $plugins = array()) {
   if (empty($plugins)) {
     // The install script calls this function with $plugins empty. Install the
-    // following plugins. See http://drupal.org/node/1389472.
+    // following plugins.
+    // @see https://drupal.org/node/1389472
     $plugins['fugitive'] = array(
       'name' => 'Fugitive',
       'description' => 'A Git wrapper so awesome, it should be illegal.',
@@ -439,7 +440,7 @@ function vimrc_download_plugins($vim, $vimrc, $bundle, $update = FALSE, $plugins
       continue;
     }
     $tempdir = drush_tempdir();
-    // See http://drupal.org/node/1642444#comment-6742834.
+    // @see https://drupal.org/node/1642444#comment-6742834
     if (!$path = _vimrc_download_file($info['tarball'], "$tempdir/$tarball")) {
       drush_log(dt('Failed to download %plugin from @uri.', array(
         '%plugin' => $info['name'],
@@ -469,7 +470,8 @@ function vimrc_download_plugins($vim, $vimrc, $bundle, $update = FALSE, $plugins
 
 /**
  * Poor substitute for _drush_download_file(), add --no-check-certificate.
- * See http://drupal.org/node/1642444#comment-6742834
+ *
+ * @see https://drupal.org/node/1642444#comment-6742834
  */
 function _vimrc_download_file($url, $destination, $overwrite = TRUE) {
   static $use_wget;
@@ -552,10 +554,20 @@ function drush_vimrc_tag_gen($path = '.') {
     $langmap .= '.test';
   }
   else {
-    $excludes = array_merge($excludes, array('simpletest', 'tests', 'Tests', 'Test', 'Test.php'));
+    $excludes = array_merge($excludes, array(
+      'simpletest',
+      'tests',
+      'Tests',
+      'Test',
+      'Test.php',
+    ));
   }
   if ($include_js == 'yes') {
-    $excludes += array_merge($excludes, array('*.min.js', '*-min.js', '*/ckeditor/lang/*.js'));
+    $excludes += array_merge($excludes, array(
+      '*.min.js',
+      '*-min.js',
+      '*/ckeditor/lang/*.js',
+    ));
   }
   else {
     $langmap .= ',javascript:';