diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java
index 7866bee8c89..929886d4390 100755
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java
@@ -132,10 +132,10 @@ public class FixLoaderAndTracker implements TrackingDataLoader {
     
     /**
      * This map contains the last maneuver for each deviceId that was sent back. It is used to efficiently piggyback a
-     * notification about new possible maneuvers into the response to adding a gpsfix for smartphone tracking. This
+     * notification about new possible maneuvers into the response to adding a GPS fix for smart phone tracking. This
      * allows the client to not require any additional polling for maneuver retrieval. The map is never cleared, as it
-     * will not take a lot of memory itself, and will not grow further after each smartphone device pushed at least one
-     * gpsfix
+     * will not take a lot of memory itself, and will not grow further after each smart phone device pushed at least one
+     * GPS fix.
      */
     private final ConcurrentHashMap<UUID, Maneuver> lastNotifiedManeuverCache = new ConcurrentHashMap<>();
 
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
index 86501ccd376..540eec805a4 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
@@ -702,13 +702,11 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
                     @Override
                     public List<Maneuver> computeCacheUpdate(Competitor competitor, EmptyUpdateInterval updateInterval)
                             throws NoWindException {
-                        Duration averageIntervalBetweenRawFixes = getTrack(competitor)
-                                .getAverageIntervalBetweenRawFixes();
+                        Duration averageIntervalBetweenRawFixes = getTrack(competitor).getAverageIntervalBetweenRawFixes();
                         if (averageIntervalBetweenRawFixes != null) {
                             ManeuverDetector maneuverDetector;
                             if (averageIntervalBetweenRawFixes.asSeconds() >= 30) {
-                                maneuverDetector = new LowGPSSamplingRateManeuverDetectorImpl(TrackedRaceImpl.this,
-                                        competitor);
+                                maneuverDetector = new LowGPSSamplingRateManeuverDetectorImpl(TrackedRaceImpl.this, competitor);
                             } else {
                                 maneuverDetector = maneuverDetectorPerCompetitorCache.getValue(competitor);
                             }