diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
index 043479139..45822ddb7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
@@ -19,8 +19,8 @@ import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.io.backup.BackupActivityHelper;
 import com.google.android.apps.mytracks.io.backup.BackupPreferencesListener;
-import com.google.android.apps.mytracks.services.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.services.sensors.ant.AntUtils;
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.apps.mytracks.util.BluetoothDeviceUtils;
 import com.google.android.maps.mytracks.R;
@@ -232,8 +232,8 @@ public class SettingsActivity extends PreferenceActivity {
 
   private void updateSensorSettings(String sensorType) {
     boolean usesBluetooth =
-      getString(R.string.zephyr_sensor_type).equals(sensorType)
-      || getString(R.string.polar_sensor_type).equals(sensorType);
+        getString(R.string.zephyr_sensor_type).equals(sensorType)
+        || getString(R.string.polar_sensor_type).equals(sensorType);
     findPreference(
         getString(R.string.bluetooth_sensor_key)).setEnabled(usesBluetooth);
     findPreference(
@@ -267,9 +267,6 @@ public class SettingsActivity extends PreferenceActivity {
     final ListPreference minRequiredAccuracy =
         (ListPreference) findPreference(
             getString(R.string.min_required_accuracy_key));
-    final ListPreference splitFrequency =
-        (ListPreference) findPreference(
-            getString(R.string.split_frequency_key));
 
     minRecordingDistance.setEntries(isMetric
         ? R.array.min_recording_distance_options
@@ -280,11 +277,20 @@ public class SettingsActivity extends PreferenceActivity {
     minRequiredAccuracy.setEntries(isMetric
         ? R.array.min_required_accuracy_options
         : R.array.min_required_accuracy_options_ft);
-    splitFrequency.setEntries(isMetric
-        ? R.array.split_frequency_options
-        : R.array.split_frequency_options_ft);
+    setTaskOptions(isMetric, R.string.announcement_frequency_key);
+    setTaskOptions(isMetric, R.string.split_frequency_key);
   }
 
+  /**
+   * Set the user visible options for a periodic task.
+   */
+  private void setTaskOptions(boolean isMetric, int listId) {
+    final ListPreference taskFrequency =
+        (ListPreference) findPreference(getString(listId));
+    taskFrequency.setEntries(isMetric
+        ? R.array.task_frequency_options
+        : R.array.task_frequency_options_ft);
+  }
 
   /**
    * Configures preference actions related to bluetooth.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParser.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParser.java
index 1e5620bfb..d8876587d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParser.java
@@ -89,11 +89,10 @@ public class PolarMessageParser implements MessageParser {
       .setValue(heartRate)
       .setState(Sensor.SensorState.SENDING);
 
-    Sensor.SensorDataSet sds =
-    Sensor.SensorDataSet.newBuilder()
-    .setCreationTime(System.currentTimeMillis())
-    .setHeartRate(b)
-    .build();
+    Sensor.SensorDataSet sds = Sensor.SensorDataSet.newBuilder()
+      .setCreationTime(System.currentTimeMillis())
+      .setHeartRate(b)
+      .build();
     
     return sds;
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
index f2d6b3852..0f6b09e69 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
@@ -11,7 +11,6 @@ public class PolarMessageParserTest extends TestCase {
   public void testIsValid() {
     // A complete and valid Polar HxM packet
     //   FE08F701D1001104FE08F702D1001104
-//  byte[] buf = { 254,8,247,1,209,0,17,4,254,8,247,2,209,0,17,4 };
     byte[] buf = { 0xFE,0x08,0xF7,0x01,0xD1,0x00,0x11,0x04,0xFE,0x08,0xF7,0x02,0xD1,0x00,0x11,0x04 };
 
     buf[0] = 0x03;                          // Invalidate header