diff --git a/site_banner.admin.inc b/site_banner.admin.inc
index 7a5ab9f..3c1806b 100755
--- a/site_banner.admin.inc
+++ b/site_banner.admin.inc
@@ -16,16 +16,25 @@ function site_banner_admin_settings_form() {
   // ****************
   // setup form structure
   // ****************
-  $form = array_merge((array) site_banner_generate_banner_status_form_elements(variable_get('site_banner_status', TRUE)),
-                      (array) site_banner_generate_banner_text_form_elements(variable_get('site_banner_text', '')),
-                      (array) site_banner_generate_bg_color_form_elements(variable_get('site_banner_background_color', '')),
-                      (array) site_banner_generate_text_color_form_elements(variable_get('site_banner_text_color', '')));
+  $form = array_merge(site_banner_generate_banner_status_form_elements(variable_get('site_banner_status', TRUE)),
+                      site_banner_generate_banner_text_form_elements(variable_get('site_banner_text', '')),
+                      site_banner_generate_bg_color_form_elements(variable_get('site_banner_background_color', '')),
+                      site_banner_generate_text_color_form_elements(variable_get('site_banner_text_color', '')));
 
   // Alter form text to better suit admin page.
-  $form['site_banner_text']['#description'] = t('The text to be displayed on the site banner. If the <a href="https://drupal.org/project/context">Context</a> module is being used, this will be the default text used when no context alters the site banner\'s text.');
+  $form['site_banner_text']['#description'] = t(
+    'The text to be displayed on the site banner. If the !context_link module is being used, this will be the default text used when no context alters the site banner\'s text.',
+    array('!context_link' => l('Context', 'https://drupal.org/project/context'))
+  );
 
-  $bg_suffix_description_text = '<br/>' . t('If the <a href="https://drupal.org/project/context">Context</a> module is being used, this will be the default background color used when no context alters the site banner\'s background color.');
-  $text_suffix_description_text = '<br/>' . t('If the <a href="https://drupal.org/project/context">Context</a> module is being used, this will be the default text color used when no context alters the site banner\'s text color.');
+  $bg_suffix_description_text = '<br/>' . t(
+    'If the !context_link module is being used, this will be the default background color used when no context alters the site banner\'s background color.',
+    array('!context_link' => l('Context', 'https://drupal.org/project/context'))
+  );
+  $text_suffix_description_text = '<br/>' . t(
+    'If the !context_link module is being used, this will be the default text color used when no context alters the site banner\'s text color.',
+    array('!context_link' => l('Context', 'https://drupal.org/project/context'))
+  );
   $form['site_banner_background_color_form']['#description'] .= $bg_suffix_description_text;
   $form['site_banner_text_color_form']['#description'] .= $text_suffix_description_text;
   $form['site_banner_background_custom_color_form']['#description'] .= $bg_suffix_description_text;
@@ -248,11 +257,11 @@ function site_banner_generate_text_color_form_elements($existing_text_color) {
  *   the background color as HTML hex color code
  */
 function site_banner_get_background_color_from_form($form_state) {
-
   return site_banner_get_background_color_code(
-          $form_state['values']['site_banner_background_color_form'],
-          $form_state['values']['site_banner_background_custom_color_form'],
-          $form_state['values']['site_banner_background_color_select']);
+    $form_state['values']['site_banner_background_color_form'],
+    $form_state['values']['site_banner_background_custom_color_form'],
+    $form_state['values']['site_banner_background_color_select']
+  );
 }
 
 /**
@@ -266,9 +275,10 @@ function site_banner_get_background_color_from_form($form_state) {
  */
 function site_banner_get_text_color_from_form($form_state) {
   return site_banner_get_text_color_code(
-          $form_state['values']['site_banner_text_color_form'],
-          $form_state['values']['site_banner_text_custom_color_form'],
-          $form_state['values']['site_banner_text_color_select']);
+    $form_state['values']['site_banner_text_color_form'],
+    $form_state['values']['site_banner_text_custom_color_form'],
+    $form_state['values']['site_banner_text_color_select']
+  );
 }
 
 /**
diff --git a/site_banner.module b/site_banner.module
index 546ec72..bba26d6 100755
--- a/site_banner.module
+++ b/site_banner.module
@@ -46,28 +46,17 @@ function site_banner_html_head_alter(&$head_elements) {
       }
     }
 
-    $banner_css_colors_value = '#footerBanner, #headerBanner{background-color:';
-    $banner_css_colors_value .= $background_color_as_text;
-    $banner_css_colors_value .= ';color:';
-    $banner_css_colors_value .= $text_color_as_text;
-    $banner_css_colors_value .= ';}';
-
     drupal_add_css(
       drupal_get_path('module', 'site_banner') . '/site_banner_screen.css',
-      array(
-        'type' => 'file',
-        'media' => 'screen',
-      )
+      array('media' => 'screen',)
     );
 
     drupal_add_css(
       drupal_get_path('module', 'site_banner') . '/site_banner_print.css',
-      array(
-        'type' => 'file',
-        'media' => 'print',
-      )
+      array('media' => 'print',)
     );
 
+    $banner_css_colors_value = "#footerBanner, #headerBanner {background-color:$background_color_as_text; color:$text_color_as_text;}";
     drupal_add_css(
       $banner_css_colors_value,
       array(
@@ -83,9 +72,7 @@ function site_banner_html_head_alter(&$head_elements) {
  * Implements hook_page_build().
  */
 function site_banner_page_build(&$page) {
-  $banner_active = variable_get('site_banner_status', '1');
-
-  if ($banner_active != '0') {
+  if (variable_get('site_banner_status', FALSE)) {
     $banner_text = variable_get('site_banner_text', '');
 
     // Execute context hooks to see if we need to alter the text or background
@@ -129,7 +116,8 @@ function site_banner_page_build(&$page) {
         ),
         '#value' => $banner_text,
         '#weight' => -100,
-      ));
+      )
+    );
   }
 }
 
@@ -137,14 +125,13 @@ function site_banner_page_build(&$page) {
  * Implements hook_permission().
  */
 function site_banner_permission() {
-  $perm = array(
+  return array(
     'manage site banner settings' => array(
       'title' => t('Administrate site banner settings.'),
       'description' => t('Alter the text and color used in the site.'),
       'restrict access' => TRUE,
     ),
   );
-  return $perm;
 }
 
 /**
@@ -272,14 +259,7 @@ function site_banner_verify_banner_text($site_banner_array, $new_banner_context,
   $banner_text = $site_banner_array[$context_tag][$current_banner_text_index];
   $new_banner_context = $new_banner_context[$new_banner_text_index];
   if ($banner_text != $new_banner_context) {
-    $error_message = 'Inconsistent ' . $form_section;
-    $error_message .= ' detected for context: ';
-    $error_message .= $context_name;
-    $error_message .= '. tag: ';
-    $error_message .= $context_tag;
-    $error_message .= '. Using first detected ';
-    $error_message .= $form_section;
-    $error_message .= '.';
+    $error_message = "Inconsistent $form_section detected for context: $context_name. tag: $context_tag. Using first detected $form_section.";
     drupal_set_message(check_plain($error_message), 'warning');
   }
 }
@@ -307,15 +287,9 @@ function site_banner_generate_context_banner_text_from_contexts($contexts, &$ban
 
         if (!array_key_exists($context_tag, $site_banner_array)) {
           // Tag does not exist - populate with initial values.
-          $site_banner_array[$context_tag]['prepend_text']
-            = $new_banner_context['site_banner_tag_prepend_text'];
-
-          $site_banner_array[$context_tag]['delimiter_text']
-            = $new_banner_context['site_banner_tag_delimiter_text'];
-
-          $site_banner_array[$context_tag]['append_text']
-            = $new_banner_context['site_banner_tag_append_text'];
-
+          $site_banner_array[$context_tag]['prepend_text'] = $new_banner_context['site_banner_tag_prepend_text'];
+          $site_banner_array[$context_tag]['delimiter_text'] = $new_banner_context['site_banner_tag_delimiter_text'];
+          $site_banner_array[$context_tag]['append_text'] = $new_banner_context['site_banner_tag_append_text'];
           $site_banner_array[$context_tag]['banner_text'] = array();
         }
         else {
diff --git a/site_banner.test b/site_banner.test
index 702f52f..32f27b8 100755
--- a/site_banner.test
+++ b/site_banner.test
@@ -161,11 +161,7 @@ class SiteBannerRenderingUnitTestCase extends DrupalUnitTestCase {
 
     $head_elements = array();
     site_banner_html_head_alter($head_elements);
-    $css_string = '#footerBanner, #headerBanner{background-color:' .
-      $background_color .
-      ';color:' .
-      $text_color .
-      ';}';
+    $css_string = "#footerBanner, #headerBanner{background-color: $background_color; color: $text_color;}";
 
     $result = ($head_elements['chrome_frame'][2]['#value'] == $css_string);
 
@@ -180,27 +176,14 @@ class SiteBannerRenderingUnitTestCase extends DrupalUnitTestCase {
     $head_elements = array();
     site_banner_html_head_alter($head_elements);
 
-    $css_string = '@import url("' .
-      $GLOBALS['base_url'] .
-      '/' .
-      drupal_get_path('module', 'site_banner') .
-      '/site_banner_screen.css");';
-
+    $path = drupal_get_path('module', 'site_banner');
+    $css_string = "@import url(\"{$GLOBALS['base_url']}/$path/site_banner_screen.css\");";
     $result = ($head_elements['chrome_frame'][0]['#value'] == $css_string);
+    $this->assertTrue($result, 'Printing CSS files are included.');
 
-    $message = 'Printing CSS files are included.';
-    $this->assertTrue($result, $message);
-
-    $css_string = '@import url("' .
-      $GLOBALS['base_url'] .
-      '/' .
-      drupal_get_path('module', 'site_banner') .
-      '/site_banner_print.css");';
-
+    $css_string = "@import url(\"{$GLOBALS['base_url']}/$path/site_banner_print.css\");";
     $result &= ($head_elements['chrome_frame'][1]['#value'] == $css_string);
-
-    $message = 'Screen CSS files are included.';
-    $this->assertTrue($result, $message);
+    $this->assertTrue($result, 'Screen CSS files are included.');
   }
 
   /**
@@ -304,13 +287,8 @@ class SiteBannerRenderingUnitTestCase extends DrupalUnitTestCase {
     $result = ($banner_text == $baseline_banner_text);
 
     $message = 'Test context can render an altered banner text properly: ';
-    $message .= 'Existing banner text = "';
-    $message .= $existing_banner_text;
-    $message .= '", Updated banner text = "';
-    $message .= $banner_text;
-    $message .= '", Baseline banner text = "';
-    $message .= $baseline_banner_text;
-    $message .= '"."';
+    $message .= "Existing banner text = \"$existing_banner_text\", Updated banner text = \"$banner_text\"";
+    $message .= ", Baseline banner text = \"$baseline_banner_text\".";
 
     $this->assertTrue($result, $message);
   }
diff --git a/site_banner_context_reaction_functions.inc b/site_banner_context_reaction_functions.inc
index 59d28c3..715e438 100755
--- a/site_banner_context_reaction_functions.inc
+++ b/site_banner_context_reaction_functions.inc
@@ -40,30 +40,17 @@ class SiteBannerContextReactionChangeBannerText extends context_reaction {
     $append_examples = '';
     foreach (context_enabled_contexts() as $context_iterator) {
       if (isset($context_iterator->tag) && !empty($context_iterator->tag)) {
-        $prepend_examples .= ' ' . $context_iterator->name .
-          ' (tag = ' . $context_iterator->tag . ', prepend text = ' .
-          site_banner_get_prepend_site_banner_text($context_iterator) . ')';
-        $delimiter_examples .= ' ' . $context_iterator->name .
-          ' (tag = ' . $context_iterator->tag . ', delimiter text = ' .
-          site_banner_get_delimiter($context_iterator) . ')';
-        $append_examples .= ' ' . $context_iterator->name .
-          ' (tag = ' . $context_iterator->tag . ', append text = ' .
-          site_banner_get_append_text($context_iterator) . ')';
+        $prefix = "{$context_iterator->name} (tag = {$context_iterator->tag},";
+        $prepend_examples = " $prefix prepend text = " . site_banner_get_prepend_site_banner_text($context_iterator) . ')';
+        $delimiter_examples = " $prefix delimiter text = " . site_banner_get_delimiter($context_iterator) . ')';
+        $append_examples = " $prefix append text = " . site_banner_get_append_text($context_iterator) . ')';
       }
     }
 
     if (!empty($prepend_examples)) {
-      $prepend_text_description .= ' Existing values are: ';
-      $prepend_text_description .= $prepend_examples;
-      $prepend_text_description .= '.';
-
-      $append_text_description .= ' Existing values are: ';
-      $append_text_description .= $append_examples;
-      $append_text_description .= '.';
-
-      $delimiter_text_description .= ' Existing values are: ';
-      $delimiter_text_description .= $delimiter_examples;
-      $delimiter_text_description .= '.';
+      $prepend_text_description .= " Existing values are: $prepend_examples.";
+      $append_text_description .= " Existing values are: $append_examples.";
+      $delimiter_text_description .= " Existing values are: $delimiter_examples.";
     }
 
     $form = site_banner_generate_banner_text_form_elements($default_banner_text);