diff --git a/field_redirection.module b/field_redirection.module
index 996a64b..06c9bcd 100644
--- a/field_redirection.module
+++ b/field_redirection.module
@@ -49,8 +49,8 @@ function field_redirection_field_formatter_info() {
   );
 }
 
-/*
- * implementation of hook_field_formatter_settings_from().
+/**
+ * Implements hook_field_formatter_settings_from().
  */
 function field_redirection_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
   // Shortcuts to make the rest of the code simpler.
@@ -156,7 +156,7 @@ function field_redirection_field_formatter_settings_summary($field, $instance, $
     );
     if (array_key_exists($view_mode, $bad_modes)) {
       $output .= '<h2>' . t('Danger, Will Robinson!') . '</h2>';
-      $output .= '<p>' . t('The Redirect formatter should not be used with the ":mode" view mode, it works best when used with the ":full" view mode.', array(':mode' => t($bad_modes[$view_mode]), ':full' => t('Full content'))) . '</p>';
+      $output .= '<p>' . t('The Redirect formatter should not be used with the ":mode" view mode, it works best when used with the "Full content" view mode.', array(':mode' => $bad_modes[$view_mode])) . '</p>';
     }
     else {
       $output .= '<h3>' . t('Careful now!') . '</h3>';
@@ -169,7 +169,7 @@ function field_redirection_field_formatter_settings_summary($field, $instance, $
   if (!empty($settings['code']) && isset($codes[$settings['code']])) {
     $code = $settings['code'];
   }
-  $output .= t('Redirect method:') . ' ' . $codes[$code];
+  $output .= t('Redirect method: @code', array('@code' => $codes[$code]));
 
   // Indicate if the option is used.
   if ($settings['404_if_empty']) {
@@ -187,7 +187,8 @@ function field_redirection_field_formatter_settings_summary($field, $instance, $
 /**
  * The standard HTTP redirection codes that are supported.
  *
- * @return The supported HTTP codes.
+ * @return
+ *   The supported HTTP codes.
  */
 function field_redirection_http_codes() {
   return array(
@@ -220,7 +221,7 @@ function field_redirection_field_formatter_view($entity_type, $entity, $field, $
     // Do raw token replacements.
     $pages = token_replace($settings['pages'], array($entity_type => $entity), array('clear' => 1, 'sanitize' => 0));
 
-    // Normalise all paths to lower case
+    // Normalise all paths to lower case.
     $pages = drupal_strtolower($pages);
     $path_alias = drupal_strtolower(drupal_get_path_alias($_GET['q']));
     $page_match = drupal_match_path($path_alias, $pages);
@@ -234,7 +235,6 @@ function field_redirection_field_formatter_view($entity_type, $entity, $field, $
     }
   }
 
-
   // Don't execute if running via the CLI, e.g. Drush.
   if (constant('PHP_SAPI') == 'cli') {
     return;
@@ -284,8 +284,9 @@ function field_redirection_field_formatter_view($entity_type, $entity, $field, $
 
       // File field from the core File module.
       case 'file':
-      // Image field from the core Image module.
+
       case 'image':
+        // Image field from the core Image module.
         if (!empty($item['uri'])) {
           $path = file_create_url($item['uri']);
         }
@@ -302,7 +303,7 @@ function field_redirection_field_formatter_view($entity_type, $entity, $field, $
             $options['query'] = $item['query'];
           }
 
-          // Optional fragment
+          // Optional fragment.
           if (!empty($item['fragment'])) {
             $options['fragment'] = $item['fragment'];
           }
@@ -373,7 +374,8 @@ function field_redirection_field_formatter_view($entity_type, $entity, $field, $
 
   // Only proceed if a path was identified.
   if (!empty($path)) {
-    // Use default language to not prepend language prefix if path is absolute without hostname.
+    // Use default language to not prepend language prefix if path is absolute
+    // without hostname.
     if ($path[0] == '/') {
       $path = substr($path, 1);
       $options['language'] = language_default();