diff --git a/superfish.admin.inc b/superfish.admin.inc
index 4af3197..039dedd 100644
--- a/superfish.admin.inc
+++ b/superfish.admin.inc
@@ -62,10 +62,10 @@ function superfish_admin_settings() {
  */
 function superfish_admin_settings_validate($form, &$form_state) {
   $error = array();
-  // Trimming blank lines and such
+  // Trimming blank lines and such.
   $sf_library = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", trim($form_state['values']['superfish_slp']));
   $sf_library = explode("\n", $sf_library);
-  // Crystal clear
+  // Crystal clear.
   foreach ($sf_library as $s) {
     if (!file_exists($s)) {
       $error[] = $s;
@@ -84,4 +84,4 @@ function superfish_admin_settings_validate($form, &$form_state) {
     }
     form_set_error('superfish_slp', $error_message);
   }
-}
\ No newline at end of file
+}
diff --git a/superfish.install b/superfish.install
index 64ec647..d4804a6 100644
--- a/superfish.install
+++ b/superfish.install
@@ -18,7 +18,7 @@ function superfish_uninstall() {
  */
 function superfish_requirements($phase) {
   $requirements = array();
-  // Ensure translations do not break at install time
+  // Ensure translations do not break at install time.
   $t = get_t();
 
   if ($phase == 'install' && !module_exists('libraries')) {
@@ -46,15 +46,55 @@ function superfish_requirements($phase) {
  */
 function superfish_update_7100() {
   // Temporary update script.
-  // (According to Drupal API documentation, "db_query" should not be used for this purpose.)
-  $query = db_query("UPDATE {variable} SET value = REPLACE(REPLACE(value, :false_old, :false_new), :true_old, :true_new) WHERE name LIKE 'superfish_arrow_%'", array(':false_old' => 'false', ':false_new' => 0, ':true_old' => 'true', ':true_new' => 1));
-  $query = db_query("UPDATE {variable} SET value = REPLACE(REPLACE(value, :false_old, :false_new), :true_old, :true_new) WHERE name LIKE 'superfish_shadow_%'", array(':false_old' => 'false', ':false_new' => 0, ':true_old' => 'true', ':true_new' => 1));
-  $query = db_query("UPDATE {variable} SET value = REPLACE(REPLACE(value, :false_old, :false_new), :true_old, :true_new) WHERE name LIKE 'superfish_slide_%'", array(':false_old' => 'false', ':false_new' => 'none', ':true_old' => 'true', ':true_new' => 'down'));
-  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name", array(':old' => 'count', ':new' => 'itemcount', ':name' => 'superfish_count_%'));
-  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name", array(':old' => 'extracss', ':new' => 'pathcss', ':name' => 'superfish_extracss_%'));
-  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name", array(':old' => 'extraclass', ':new' => 'ulclass', ':name' => 'superfish_extraclass_%'));
-  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name", array(':old' => 'linkwrapper', ':new' => 'wrapli', ':name' => 'superfish_linkwrapper_%'));
-  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name", array(':old' => 'linktextwrapper', ':new' => 'wraphlt', ':name' => 'superfish_linktextwrapper_%'));
-  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name", array(':old' => 'mulwrapper', ':new' => 'wrapmul', ':name' => 'superfish_mulwrapper_%'));
+  // (According to Drupal API documentation, "db_query"
+  // should not be used for this purpose.)
+  $query = db_query("UPDATE {variable} SET value = REPLACE(REPLACE(value, :false_old, :false_new), :true_old, :true_new) WHERE name LIKE 'superfish_arrow_%'",
+    array(
+      ':false_old' => 'false',
+      ':false_new' => 0,
+      ':true_old' => 'true',
+      ':true_new' => 1));
+  $query = db_query("UPDATE {variable} SET value = REPLACE(REPLACE(value, :false_old, :false_new), :true_old, :true_new) WHERE name LIKE 'superfish_shadow_%'",
+    array(
+      ':false_old' => 'false',
+      ':false_new' => 0,
+      ':true_old' => 'true',
+      ':true_new' => 1));
+  $query = db_query("UPDATE {variable} SET value = REPLACE(REPLACE(value, :false_old, :false_new), :true_old, :true_new) WHERE name LIKE 'superfish_slide_%'",
+    array(
+      ':false_old' => 'false',
+      ':false_new' => 'none',
+      ':true_old' => 'true',
+      ':true_new' => 'down'));
+  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name",
+    array(
+      ':old' => 'count',
+      ':new' => 'itemcount',
+      ':name' => 'superfish_count_%'));
+  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name",
+    array(
+      ':old' => 'extracss',
+      ':new' => 'pathcss',
+      ':name' => 'superfish_extracss_%'));
+  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name",
+    array(
+      ':old' => 'extraclass',
+      ':new' => 'ulclass',
+      ':name' => 'superfish_extraclass_%'));
+  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name",
+    array(
+      ':old' => 'linkwrapper',
+      ':new' => 'wrapli',
+      ':name' => 'superfish_linkwrapper_%'));
+  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name",
+    array(
+      ':old' => 'linktextwrapper',
+      ':new' => 'wraphlt',
+      ':name' => 'superfish_linktextwrapper_%'));
+  $query = db_query("UPDATE {variable} SET name = REPLACE(name, :old, :new) WHERE name LIKE :name",
+    array(
+      ':old' => 'mulwrapper',
+      ':new' => 'wrapmul',
+      ':name' => 'superfish_mulwrapper_%'));
 
-}
\ No newline at end of file
+}
diff --git a/superfish.module b/superfish.module
index 9bf96ba..bad0ec9 100644
--- a/superfish.module
+++ b/superfish.module
@@ -29,8 +29,9 @@ function superfish_help($path, $arg) {
     case 'admin/modules#description':
       $output .= t('jQuery Superfish plugin for your Drupal menus.');
       break;
+
     case 'admin/config/user-interface/superfish':
-      $output .= t('<p>Block-specific Superfish settings could be found at !link</p>', array('!link' => l('admin/structure/block', 'admin/structure/block')));
+      $output .= t('<p>Block-specific Superfish settings could be found at !link</p>', array('!link' => l(t('admin/structure/block'), 'admin/structure/block')));
       break;
   }
   return $output;
@@ -105,8 +106,8 @@ function superfish_block_configure($delta = 0) {
       'space-orange' => t('Space [Orange]'),
       'space-teal' => t('Space [Teal]'),
       'spring' => t('Spring'),
-      'white' => t('White')
-      ),
+      'white' => t('White'),
+    ),
   );
   $form['sf-settings']['superfish_speed_' . $delta] = array(
     '#type' => 'textfield',
@@ -144,7 +145,7 @@ function superfish_block_configure($delta = 0) {
       'none' => t('None'),
       'vertical' => t('Vertical'),
       'horizontal' => t('Horizontal'),
-      'diagonal' => t('Diagonal')
+      'diagonal' => t('Diagonal'),
     ),
   );
   $form['sf-settings']['superfish_shadow_' . $delta] = array(
@@ -482,7 +483,7 @@ function superfish_block_save($delta = 0, $edit = array()) {
 function superfish_contents($delta = 0) {
   global $language;
   list($menu_name, $mlid) = explode(':', variable_get('superfish_menu_' . $delta, 'main-menu:0'));
-  
+
   $sfsettings = $sfoptions = $sfplugins = array();
   $sfsettings['depth'] = variable_get('superfish_depth_' . $delta, '-1');
   $sfsettings['type'] = variable_get('superfish_type_' . $delta, 'horizontal');
@@ -563,20 +564,20 @@ function superfish_contents($delta = 0) {
     $supersubs = '';
   }
 
-  // Finally our Javascript
+  // Finally our Javascript.
   $javascript = "jQuery(function(){\n" . "jQuery('#superfish-" . $delta . "')" . $supersubs . ".superfish({\n" . $sfoptions . "})" . $sfplugins . ";\n});";
 
   $vars = array(
     'id' => $delta,
     'menu_name' => $menu_name,
     'mlid' => $mlid,
-    'sfsettings' => $sfsettings
+    'sfsettings' => $sfsettings,
   );
   if ($output = theme('superfish', $vars)) {
-    // Adding required Javascript
+    // Adding required Javascript.
     drupal_add_js($javascript, array('type' => 'inline', 'weight' => 100));
 
-    // Adding required CSS files
+    // Adding required CSS files.
     if ($sfsettings['style'] != 'none') {
       if (module_exists('libraries')) {
         drupal_add_css(libraries_get_path('superfish') . '/style/' . $sfsettings['style'] . '.css');
@@ -595,7 +596,7 @@ function superfish_contents($delta = 0) {
       }
     }
   }
-  
+
   return $output;
 }
 
@@ -634,7 +635,8 @@ function superfish_block_validate($form, &$form_state) {
     if (empty($speed)) {
       form_set_error('superfish_speed_' . $delta, t('<strong>Animation speed</strong> field cannot be empty.'));
     }
-    elseif (!is_numeric($speed) && !in_array($speed, array('slow', 'normal', 'fast'))) {
+    elseif (!is_numeric($speed) &&
+        !in_array($speed, array('slow', 'normal', 'fast'))) {
       form_set_error('superfish_speed_' . $delta, t('<strong>Animation speed</strong>: unacceptable value entered.'));
     }
     if (!is_numeric($delay)) {
@@ -724,7 +726,7 @@ function superfish_theme() {
         'id' => NULL,
         'menu_name' => NULL,
         'mlid' => NULL,
-        'sfsettings' => NULL
+        'sfsettings' => NULL,
       ),
     ),
     'superfish_build' => array(
@@ -733,9 +735,9 @@ function superfish_theme() {
         'menu' => NULL,
         'depth' => -1,
         'trail' => NULL,
-        'sfsettings' => NULL
+        'sfsettings' => NULL,
       ),
-    )
+    ),
   );
 }
 
@@ -765,7 +767,7 @@ function theme_superfish($variables) {
   $menu_name = $variables['menu_name'];
   $mlid = $variables['mlid'];
   $sfsettings = $variables['sfsettings'];
-  
+
   $cache_key = 'links:' . $menu_name . ':all-cid:' . $variables['mlid'] . ':' . $user->uid . ':' . $language->language;
   $cache = cache_get($cache_key, 'cache_menu');
   if ($cache && isset($cache->data)) {
@@ -801,20 +803,20 @@ function theme_superfish($variables) {
     cache_set($cache_key, $cache, 'cache_menu');
     $cache = cache_get($cache_key, 'cache_menu')->data;
   }
-  
+
   $output['content'] = '';
   $output['subject'] = $cache['title'];
   if ($cache['menu']) {
     // Set the total menu depth counting from this parent if we need it.
     $depth = $sfsettings['depth'];
     $depth = ($sfsettings['depth'] > 0 && isset($cache['parent_depth'])) ? $cache['parent_depth'] + $depth : $depth;
-    
+
     $var = array(
       'id' => $id,
       'menu' => $cache['menu'],
       'depth' => $depth,
       'trail' => superfish_build_page_trail(menu_tree_page_data($menu_name)),
-      'sfsettings' => $sfsettings
+      'sfsettings' => $sfsettings,
     );
     if ($menu_tree = theme('superfish_build', $var)) {
       if ($menu_tree['content']) {
@@ -872,7 +874,7 @@ function theme_superfish_build($variables) {
     $show_children = $megamenu_wrapper = $megamenu_column = $megamenu_content = FALSE;
     $item_class = $link_options = $link_class = array();
     $mlid = $menu_item['link']['mlid'];
-  
+
     if (!isset($menu_item['link']['hidden']) || $menu_item['link']['hidden'] == 0) {
       $item_class[] = ($trail && in_array($mlid, $trail)) ? 'active-trail' : '';
 
@@ -928,7 +930,7 @@ function theme_superfish_build($variables) {
       // Add custom HTML codes around the hyperlinks.
       if ($settings['wraphl'] && strpos($settings['wraphl'], ',') !== FALSE) {
         $whl = explode(',', $settings['wraphl']);
-        // The same as above
+        // The same as above.
         if (drupal_substr($settings['wraphl'], 0) == ',') {
           array_unshift($whl, '');
         }
@@ -940,7 +942,7 @@ function theme_superfish_build($variables) {
       // Add custom HTML codes around the hyperlinks text.
       if ($settings['wraphlt'] && strpos($settings['wraphlt'], ',') !== FALSE) {
         $whlt = explode(',', $settings['wraphlt']);
-        // The same as above
+        // The same as above.
         if (drupal_substr($settings['wraphlt'], 0) == ',') {
           array_unshift($whlt, '');
         }
@@ -950,7 +952,8 @@ function theme_superfish_build($variables) {
 
 
       if (!empty($menu_item['link']['has_children']) && !empty($menu_item['below']) && $depth != 0) {
-        // Megamenu is still beta, there is a good chance much of this will be changed.
+        // Megamenu is still beta,
+        // there is a good chance much of this will be changed.
         if (!empty($settings['megamenu_exclude'])) {
           if (is_array($settings['megamenu_exclude'])) {
             $megamenu = (in_array($mlid, $settings['megamenu_exclude'])) ? 0 : $megamenu;
@@ -971,7 +974,7 @@ function theme_superfish_build($variables) {
           'id' => $id,
           'menu' => $menu_item['below'],
           'depth' => $depth, 'trail' => $trail,
-          'sfsettings' => $sfsettings
+          'sfsettings' => $sfsettings,
         );
         $children = theme('superfish_build', $var);
         // Check to see whether it should be displayed.
@@ -995,15 +998,15 @@ function theme_superfish_build($variables) {
       }
 
       $item_class = implode(' ', array_filter($item_class));
-      
+
       if (isset($menu_item['link']['localized_options']['attributes']['class'])) {
         $link_class_current = $menu_item['link']['localized_options']['attributes']['class'];
         $link_class = array_merge($link_class_current, array_filter($link_class));
       }
       $menu_item['link']['localized_options']['attributes']['class'] = $link_class;
- 
+
       $link_options['attributes'] = $menu_item['link']['localized_options']['attributes'];
-      
+
       // Render the menu item.
       $output['content'] .= '<li id="menu-' . $mlid . '-' . $id . '"';
       $output['content'] .= ($item_class) ? ' class="' . trim($item_class) . '">' : '>';
@@ -1026,4 +1029,4 @@ function theme_superfish_build($variables) {
   $output['parent_children'] = $parent_children;
   $output['single_children'] = $single_children;
   return $output;
-}
\ No newline at end of file
+}