diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index f425d3760..f2af9e235 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -2311,8 +2311,8 @@ limitations under the License.
   <string name="track_detail_install_earth_message"
     translation_description="When playing a track, the message informing the user that he needs
       Google Earth to play the track and asking him if he wants to install Google Earth from the
-      Android Market.">
-    You need Google Earth to play the track. Do you want to install from the Market?
+      Play Store.">
+    You need Google Earth to play the track. Do you want to install from the Play Store?
   </string>
   <string name="track_icon_description"
     translation_description="The accessibility description for the track icon.">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index d9ad2b6e5..ed2b52c63 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -102,10 +102,8 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     new OnSharedPreferenceChangeListener() {
     @Override
     public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-      if (key == null) {
-        return;
-      }
-      if (key.equals(getString(R.string.recording_track_key))) {
+      // Note that key can be null
+      if (getString(R.string.recording_track_key).equals(key)) {
         if (isRecording()) {
           trackRecordingServiceConnection.startAndBind();
         }
@@ -219,8 +217,7 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
             R.string.track_detail_delete_confirm_message, new DialogInterface.OnClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which) {
-                long trackId = trackDataHub.getSelectedTrackId();
-                MyTracksProviderUtils.Factory.get(TrackDetailActivity.this).deleteTrack(trackId);
+                deleteCurrentTrack();
                 startTrackListActivity();
               }
             });
@@ -282,7 +279,7 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
         stopRecording();
         return true;
       case R.id.menu_insert_marker:
-        // TODO:
+        // TODO: Add insert marker when updating WaypointList to ICS
         return true;
       case R.id.menu_play:
         if (PlayTrackUtils.isEarthInstalled(this)) {
@@ -438,7 +435,7 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
   }
 
   /**
-   * s Updates the menu items.
+   * Updates the menu items.
    *
    * @param isRecording true if recording
    */
@@ -469,6 +466,14 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     }
   }
 
+  /**
+   * Deletes the current track.
+   */
+  private void deleteCurrentTrack() {
+    long trackId = trackDataHub.getSelectedTrackId();
+    MyTracksProviderUtils.Factory.get(TrackDetailActivity.this).deleteTrack(trackId);
+  }
+
   /**
    * Starts the {@link TrackListActivity} and ends this activity.
    */
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index da4e9f464..c515cd16b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -86,24 +86,25 @@ public class TrackListActivity extends FragmentActivity {
   private final Runnable bindChangedCallback = new Runnable() {
     @Override
     public void run() {
-      if (startNewRecording) {
-        ITrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
-        if (service != null) {
-          try {
-            recordingTrackId = service.startNewTrack();
-            startNewRecording = false;
-            Toast.makeText(
-                TrackListActivity.this, R.string.track_list_record_success, Toast.LENGTH_SHORT)
-                .show();
-            Log.d(TAG, "Started a new recording");
-          } catch (Exception e) {
-            Toast.makeText(
-                TrackListActivity.this, R.string.track_list_record_error, Toast.LENGTH_LONG).show();
-            Log.d(TAG, "Unable to start a new recording.", e);
-          }
-        } else {
-          Log.d(TAG, "service not available to start a new recording");
-        }
+      if (!startNewRecording) {
+        return;
+      }
+
+      ITrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
+      if (service == null) {
+        Log.d(TAG, "service not available to start a new recording");
+        return;
+      }
+      try {
+        recordingTrackId = service.startNewTrack();
+        startNewRecording = false;
+        Toast.makeText(
+            TrackListActivity.this, R.string.track_list_record_success, Toast.LENGTH_SHORT).show();
+        Log.d(TAG, "Started a new recording");
+      } catch (Exception e) {
+        Toast.makeText(TrackListActivity.this, R.string.track_list_record_error, Toast.LENGTH_LONG)
+            .show();
+        Log.e(TAG, "Unable to start a new recording.", e);
       }
     }
   };
@@ -116,13 +117,11 @@ public class TrackListActivity extends FragmentActivity {
     new OnSharedPreferenceChangeListener() {
     @Override
     public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-      if (key == null) {
-        return;
-      }
-      if (key.equals(getString(R.string.metric_units_key))) {
+      // Note that key can be null
+      if (getString(R.string.metric_units_key).equals(key)) {
         metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true);
       }
-      if (key.equals(getString(R.string.recording_track_key))) {
+      if (getString(R.string.recording_track_key).equals(key)) {
         recordingTrackId = sharedPreferences.getLong(getString(R.string.recording_track_key), -1L);
         if (isRecording()) {
           trackRecordingServiceConnection.startAndBind();