diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
index 5e689ff..754260f 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
@@ -32,7 +32,7 @@ class TrackerTest extends DrupalWebTestCase {
     return array(
       'name' => 'Tracker',
       'description' => 'Create and delete nodes and check for their display in the tracker listings.',
-      'group' => 'Tracker'
+      'group' => 'Tracker',
     );
   }
 
@@ -41,7 +41,12 @@ class TrackerTest extends DrupalWebTestCase {
 
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
 
-    $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
+    $permissions = array(
+      'access comments',
+      'create page content',
+      'post comments',
+      'skip comment approval',
+    );
     $this->user = $this->drupalCreateUser($permissions);
     $this->other_user = $this->drupalCreateUser($permissions);
 
@@ -114,7 +119,11 @@ class TrackerTest extends DrupalWebTestCase {
     $this->assertText($other_published_my_comment->title, t("Nodes that the user has commented on appear in the user's tracker listing."));
 
     // Verify that unpublished comments are removed from the tracker.
-    $admin_user = $this->drupalCreateUser(array('post comments', 'administer comments', 'access user profiles'));
+    $admin_user = $this->drupalCreateUser(array(
+      'post comments',
+      'administer comments',
+      'access user profiles',
+    ));
     $this->drupalLogin($admin_user);
     $this->drupalPost('comment/1/edit', array('status' => COMMENT_NOT_PUBLISHED), t('Save'));
     $this->drupalGet('user/' . $this->user->uid . '/track');
@@ -249,7 +258,11 @@ class TrackerTest extends DrupalWebTestCase {
    * Tests that publish/unpublish works at admin/content/node.
    */
   function testTrackerAdminUnpublish() {
-    $admin_user = $this->drupalCreateUser(array('access content overview', 'administer nodes', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(array(
+      'access content overview',
+      'administer nodes',
+      'bypass node access',
+    ));
     $this->drupalLogin($admin_user);
 
     $node = $this->drupalCreateNode(array(
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index a5887f2..9e6e8ac 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -165,7 +165,8 @@ function tracker_cron() {
  * @see tracker_menu()
  */
 function _tracker_myrecent_access($account) {
-  // This path is only allowed for authenticated users looking at their own content.
+  // This path is only allowed for authenticated users looking at their own
+  // content.
   return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('access content');
 }
 
@@ -301,8 +302,8 @@ function _tracker_add($nid, $uid, $changed) {
  *   A node ID.
  *
  * @return
- *  The $node->changed timestamp, or most recent comment timestamp, whichever
- *  is the greatest.
+ *   The $node->changed timestamp, or most recent comment timestamp, whichever
+ *   is the greatest.
  */
 function _tracker_calculate_changed($nid) {
   $changed = db_query('SELECT changed FROM {node} WHERE nid = :nid', array(':nid' => $nid), array('target' => 'slave'))->fetchField();
@@ -320,7 +321,7 @@ function _tracker_calculate_changed($nid) {
  * Cleans up indexed data when nodes or comments are removed.
  *
  * @param $nid
- *  The node ID.
+ *   The node ID.
  * @param $uid
  *   The author of the node or comment.
  * @param $changed
@@ -329,9 +330,9 @@ function _tracker_calculate_changed($nid) {
 function _tracker_remove($nid, $uid = NULL, $changed = NULL) {
   $node = db_query('SELECT nid, status, uid, changed FROM {node} WHERE nid = :nid', array(':nid' => $nid))->fetchObject();
 
-  // The user only keeps his or her subscription if both of the following are true:
-  //   (1) The node exists.
-  //   (2) The user is either the node author or has commented on the node.
+  // Users only keep their subscriptions if both of the following are true:
+  // - The node exists.
+  // - The user is either the node author or has commented on the node.
   $keep_subscription = FALSE;
 
   if ($node) {
@@ -357,19 +358,17 @@ function _tracker_remove($nid, $uid = NULL, $changed = NULL) {
     }
 
     // Now we need to update the (possibly) changed timestamps for other users
-    // and the node itself.
-    // We only need to do this if the removed item has a timestamp that equals
-    // or exceeds the listed changed timestamp for the node.
+    // and the node itself. We only need to do this if the removed item has a
+    // timestamp that equals or exceeds the listed changed timestamp for the
+    // node.
     $tracker_node = db_query('SELECT nid, changed FROM {tracker_node} WHERE nid = :nid', array(':nid' => $nid))->fetchObject();
     if ($tracker_node && $changed >= $tracker_node->changed) {
       // If we're here, the item being removed is *possibly* the item that
-      // established the node's changed timestamp.
-
-      // We just have to recalculate things from scratch.
+      // established the node's changed timestamp. We just have to recalculate
+      // things from scratch.
       $changed = _tracker_calculate_changed($nid);
 
-      // And then we push the out the new changed timestamp to our denormalized
-      // tables.
+      // Then, push out the new, changed timestamp to the denormalized tables.
       db_update('tracker_node')
         ->fields(array(
           'changed' => $changed,
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index 30583be..54555e4 100644
--- a/core/modules/tracker/tracker.pages.inc
+++ b/core/modules/tracker/tracker.pages.inc
@@ -66,9 +66,10 @@ function tracker_page($account = NULL, $set_title = FALSE) {
         }
       }
 
+      $marker = theme('mark', array('type' => node_mark($node->nid, $node->changed)));
       $row = array(
         'type' => check_plain(node_type_get_name($node->type)),
-        'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed)))),
+        'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . $marker),
         'author' => array('data' => theme('username', array('account' => $node))),
         'replies' => array('class' => array('replies'), 'data' => $comments),
         'last updated' => array('data' => t('!time ago', array('!time' => format_interval(REQUEST_TIME - $node->last_activity)))),
@@ -116,7 +117,13 @@ function tracker_page($account = NULL, $set_title = FALSE) {
 
   $page['tracker'] = array(
     '#rows' => $rows,
-    '#header' => array(t('Type'), t('Title'), t('Author'), t('Replies'), t('Last updated')),
+    '#header' => array(
+      t('Type'),
+      t('Title'),
+      t('Author'),
+      t('Replies'),
+      t('Last updated'),
+    ),
     '#theme' => 'table',
     '#empty' => t('No content available.'),
   );