diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/StrideReadings.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/StrideReadings.java
index f6a4ee954..d01987175 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/StrideReadings.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/StrideReadings.java
@@ -48,13 +48,13 @@ public class StrideReadings {
     // TODO: Calibrate this using a reliable footpod / cadence sensor, 
     // otherwise use heartbeat timestamp for calculation. 
     strideReadingsHistory.add(0, numStrides);
-    while(strideReadingsHistory.size() > NUM_READINGS_FOR_AVERAGE) {
+    while (strideReadingsHistory.size() > NUM_READINGS_FOR_AVERAGE) {
       strideReadingsHistory.remove(strideReadingsHistory.size()-1);
     }
   }
 
   public int getCadence() {
-    if(strideReadingsHistory.size() < MIN_READINGS_FOR_AVERAGE) {
+    if (strideReadingsHistory.size() < MIN_READINGS_FOR_AVERAGE) {
       // Bail out if we cannot really get a meaningful average yet.
       return CADENCE_NOT_AVAILABLE;
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java
index ffd62e42c..24d93c2fd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java
@@ -76,8 +76,8 @@ public class ZephyrMessageParser implements MessageParser {
       }
     } else {
       cadence
-      .setValue(SensorUtils.unsignedShortToIntLittleEndian(buffer, 56) / 16)
-      .setState(Sensor.SensorState.SENDING);
+        .setValue(SensorUtils.unsignedShortToIntLittleEndian(buffer, 56) / 16)
+        .setState(Sensor.SensorState.SENDING);
     }
     sds.setCadence(cadence);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/StrideReadingsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/StrideReadingsTest.java
index 3f73090e8..23a0276b4 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/StrideReadingsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/StrideReadingsTest.java
@@ -30,7 +30,7 @@ public class StrideReadingsTest extends TestCase {
   public void testAverageCadenceAvailable() {
     StrideReadings strideReadings = new StrideReadings();
     // 2 steps / second => Cadence is 120 / minute
-    for (int i=1;i<=30;i++) {
+    for (int i = 1; i <= 30; i++) {
       strideReadings.updateStrideReading(i*2);
       if (i >= StrideReadings.MIN_READINGS_FOR_AVERAGE) {
         assertEquals(120, strideReadings.getCadence());
@@ -51,7 +51,7 @@ public class StrideReadingsTest extends TestCase {
     // initialStrides set to a value below 128 to ensure rollover.
     int initialStrides = 128 - StrideReadings.NUM_READINGS_FOR_AVERAGE - 5;
 
-    for (int i=1;i<=StrideReadings.NUM_READINGS_FOR_AVERAGE+10;i++) {
+    for (int i = 1; i <= StrideReadings.NUM_READINGS_FOR_AVERAGE + 10; i++) {
       strideReadings.updateStrideReading((initialStrides + i) % 128);
       if (i >= StrideReadings.MIN_READINGS_FOR_AVERAGE) {
         assertEquals(60, strideReadings.getCadence());