diff --git a/flag_tracker.module b/flag_tracker.module
index d80fb9d..f176c5c 100644
--- a/flag_tracker.module
+++ b/flag_tracker.module
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  *   Flag tracker module.
@@ -25,7 +26,7 @@ function flag_tracker_form_node_type_form_alter(&$form, $form_state) {
     '#group' => 'additional_settings',
     '#attached' => array(
       'js' => array(
-        'vertical-tabs' => drupal_get_path('module', 'flag_tracker') . "/flag_tracker_vertical_tabs.js"
+        'vertical-tabs' => drupal_get_path('module', 'flag_tracker') . '/flag_tracker_vertical_tabs.js',
       ),
     ),
   );
@@ -35,11 +36,11 @@ function flag_tracker_form_node_type_form_alter(&$form, $form_state) {
     $flag_options[$flag->name] = $flag->title;
   }
   $form['flag_tracker']['flag_tracker_track_flag'] = array(
-    '#title' => t('Flag for following issues'),
+    '#title' => t('Flag for following'),
     '#type' => 'select',
     '#options' => $flag_options,
     '#default_value' => flag_tracker_get_tracker_flag($form['#node_type']->type),
-    '#description' => t("Select which flag to use for this content type."),
+    '#description' => t('Select which flag to use for this content type.'),
   );
   $form['flag_tracker']['flag_tracker_show_followers'] = array(
     '#title' => t('Show number of users following'),
@@ -48,14 +49,8 @@ function flag_tracker_form_node_type_form_alter(&$form, $form_state) {
   );
 }
 
-
 /**
- * Finds the flag name for following content on this site (if any).
- *
- * If the flag module (http://drupal.org/project/flag) is enabled, tracker2
- * can be configured to use a flag for following content. This function
- * consolidates the checks for if that's all configured, and if so, returns
- * the name of the flag being used for this feature.
+ * Return the flag name for following content on this site (if any).
  *
  * @return
  *   The name of the flag being used for following content, or '' (an empty
@@ -63,25 +58,23 @@ function flag_tracker_form_node_type_form_alter(&$form, $form_state) {
  *   this purpose.
  */
 function flag_tracker_get_tracker_flag($node_type = 'default') {
-  $flag = '';
-  $flag = variable_get('flag_tracker_track_flag_' . $node_type, 0);
-
-  return $flag;
+  return variable_get('flag_tracker_track_flag_' . $node_type, '');
 }
 
-
-
 /**
- *Implements hook_flag().
+ * Implements hook_flag().
  */
 function flag_tracker_flag($event, $flag, $content_id, $account) {
-  // If this is a node flag see if its configured to as the flag for this content type.
+
+  // If this is a node flag see if it's configured as the tracker flag for
+  // this content type.
   if ($flag->content_type == 'node') {
     $node = node_load($content_id);
     // If this flag is the one we're configured to use for following, ensure
     // that the Tracker data reflects the current state of the flag for the
     // given user and node.
-    if (($flag_name = flag_tracker_get_tracker_flag($node->type)) && $flag->name == $flag_name) {
+    $flag_name = flag_tracker_get_tracker_flag($node->type);
+    if (!empty($flag_name) && $flag->name == $flag_name) {
       switch ($event) {
         case 'flag':
           _tracker_add($content_id, $account->uid, $node->changed, FALSE);
@@ -97,7 +90,7 @@ function flag_tracker_flag($event, $flag, $content_id, $account) {
 }
 
 /**
- * Implement hook_flag_default_flags().
+ * Implements hook_flag_default_flags().
  */
 function flag_tracker_flag_default_flags() {
   $flags = array();
@@ -133,7 +126,7 @@ function flag_tracker_flag_default_flags() {
 }
 
 /**
- * Implementation of template_preprocess_flag().
+ * Implements hook_preprocess_flag().
  */
 function flag_tracker_preprocess_flag(&$variables) {
   $flag = $variables['flag'];
@@ -147,11 +140,12 @@ function flag_tracker_preprocess_flag(&$variables) {
     $node = node_load($variables['content_id']);
     $show_followers = variable_get('flag_tracker_show_followers_' . $node->type, FLAG_TRACKER_FOLLOWERS_COUNT_NOT_SHOWN);
     if ($show_followers) {
-      // Get current number of people following the issue.
+      // Get the current number of people following the node.
       $flag_count = flag_get_counts('node', $node->nid);
       if (array_key_exists($follow_flag, $flag_count)) {
         $flag_count = $flag_count[$follow_flag]; 
-      } else {
+      }
+      else {
         $flag_count = 0;
       }
       drupal_add_js(array('flag_tracker' => array('follower_count' => $flag_count)), 'setting');
@@ -161,7 +155,7 @@ function flag_tracker_preprocess_flag(&$variables) {
 }
 
 /**
- * Implementation of hook_theme_registry_alter()
+ * Implements hook_theme_registry_alter().
  */
 function flag_tracker_theme_registry_alter(&$theme_registry) {
   if (isset($theme_registry['flag'])) {