diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
index 0c6cd71c5..6dd876a13 100644
--- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
+++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
@@ -356,8 +356,10 @@ protected boolean drawIfChartPointHasNoData() {
         updateDimensions();
 
         // Either speedSeries or paceSeries should be enabled, if one is shown.
-        speedSeries.setEnabled(reportSpeed && showPaceOrSpeed);
-        paceSeries.setEnabled(!reportSpeed && showPaceOrSpeed);
+        if (showPaceOrSpeed) {
+            speedSeries.setEnabled(reportSpeed);
+            paceSeries.setEnabled(!reportSpeed);
+        }
 
         // Defaults for our chart series.
         heartRateSeries.setEnabled(showHeartRate);
@@ -416,39 +418,30 @@ public boolean applyReportSpeed() {
         return false;
     }
 
-    public void setShowElevation(boolean value) { showElevation = value; }
-    public boolean getShowElevation() { return showElevation; }
-    public boolean applyShowElevation() {
-        if (!showElevation) {
-            elevationSeries.setEnabled(false);
-            return true;
-        }
-        elevationSeries.setEnabled(true);
-        return true;
+    void setShowElevation(boolean value) {
+        showElevation = value;
+        elevationSeries.setEnabled(value);
     }
-    public void setShowPaceOrSpeed(boolean value) { showPaceOrSpeed = value; }
-    public boolean getShowPaceOrSpeed() { return showPaceOrSpeed; }
-    public boolean applyShowPaceOrSpeed() {
+    boolean getShowElevation() { return showElevation; }
+    void setShowPaceOrSpeed(boolean value) {
+        showPaceOrSpeed = value;
+
         if (!showPaceOrSpeed) {
             paceSeries.setEnabled(false);
             speedSeries.setEnabled(false);
-            return true;
+            return;
         }
+
         // we want to make sure we show whatever version the user has
         // selected when we turn this back on.
         applyReportSpeed();
-        return true;
     }
-    public void setShowHeartRate(boolean value) { showHeartRate = value; }
-    public boolean getShowHeartRate() { return showHeartRate; }
-    public boolean applyShowHeartRate() {
-        if (!showElevation) {
-            heartRateSeries.setEnabled(false);
-            return true;
-        }
-        heartRateSeries.setEnabled(true);
-        return true;
+    boolean getShowPaceOrSpeed() { return showPaceOrSpeed; }
+    void setShowHeartRate(boolean value) {
+        showHeartRate = value;
+        heartRateSeries.setEnabled(value);
     }
+    boolean getShowHeartRate() { return showHeartRate; }
 
     public void setShowPointer(boolean value) {
         showPointer = value;
@@ -828,7 +821,7 @@ private void drawYAxis(Canvas canvas) {
 
         //TODO
         int markerXPosition = x - spacer;
-        int index = titleDimensions.titlePositions.size() - 1; // index only onver the visible chart series
+        int index = titleDimensions.titlePositions.size() - 1; // index only over the visible chart series
         final int lastDrawn2ndLineMarkerIndex = getYmarkerCountOn1stLine();
         for (int i = seriesList.size()-1; i>=0 ;--i) { // draw markers from the last series to achieve right alignment
             ChartValueSeries chartValueSeries = seriesList.get(i);