diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
index cab97af12..80cf399dc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
@@ -85,8 +85,9 @@ public class AggregatedStatsActivity extends Activity implements
   }
 
   /**
-   * 1. Reads tracks from the db 2. Merges the trip stats from the tracks 3.
-   * Updates the view
+   * 1. Reads tracks from the db 
+   * 2. Merges the trip stats from the tracks 
+   * 3. Updates the view
    */
   private void loadAggregatedStats() {
     List<Track> tracks = retrieveTracks();
@@ -102,7 +103,7 @@ public class AggregatedStatsActivity extends Activity implements
   }
 
   private List<Track> retrieveTracks() {
-    return tracksProvider.retrieveAllTracks();
+    return tracksProvider.getAllTracks();
   }
 
   private void updateView(TripStatistics aggStats) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 21ee9c6ec..1ba326910 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -141,8 +141,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   private MenuItem listTracks;
   private MenuItem listMarkers;
   private MenuItem settings;
-  private MenuItem help;
   private MenuItem aggregatedStats;
+  private MenuItem help;
+
 
   /*
    * Information on upload success to MyMaps/Docs.
@@ -431,10 +432,10 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     settings = menu.add(0, MyTracksConstants.MENU_SETTINGS, 10001,
         R.string.settings);
     settings.setIcon(android.R.drawable.ic_menu_preferences);
-    help = menu.add(0, MyTracksConstants.MENU_HELP, 10002, R.string.help);
-    help.setIcon(android.R.drawable.ic_menu_info_details);
     aggregatedStats = menu.add(0, MyTracksConstants.MENU_AGGREGATED_STATS, 
-        10003, R.string.aggregated_stats);
+            10002, R.string.aggregated_stats);
+    help = menu.add(0, MyTracksConstants.MENU_HELP, 10003, R.string.help);
+    help.setIcon(android.R.drawable.ic_menu_info_details);
     return true;
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
index 9d86ed21c..640ce6628 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
@@ -193,7 +193,7 @@ public interface MyTracksProviderUtils {
    * 
    * @return a list of all the recorded tracks
    */
-  List<Track> retrieveAllTracks();
+  List<Track> getAllTracks();
 
   /**
    * Loads the track points for a given track.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
index 8a8123b05..a720db509 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
@@ -807,7 +807,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
   }
   
   @Override
-  public List<Track> retrieveAllTracks() {
+  public List<Track> getAllTracks() {
     List<Track> tracks = new LinkedList<Track>();
     Cursor cursor = getTracksCursor(null);
     if (cursor != null && cursor.moveToFirst()) {