diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java
index 00c7dccd1..201422352 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java
@@ -44,7 +44,7 @@ public interface NearbyParentFragmentContract {
     }
     
     interface ViewsAreReadyCallback {
-        void nearbyFragmentAndMapViewReady1();
-        void nearbyFragmentAndMapViewReady2();
+        void nearbyFragmentsAreReady();
+        void nearbyMapViewReady();
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
index e6fd39e98..a1e1cfe14 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -174,7 +173,7 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
                 }
 
                 this.mapboxMap = mapboxMap;
-                viewsAreReadyCallback.nearbyFragmentAndMapViewReady2();
+                viewsAreReadyCallback.nearbyMapViewReady();
                 //addMapMovementListeners();
                 //updateMapSignificantlyForCurrentLocation();
             });
@@ -399,7 +398,7 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
     public void viewsAreAssignedToPresenter(NearbyParentFragmentContract.ViewsAreReadyCallback viewsAreReadyCallback) {
         Timber.d("Views are set");
         this.viewsAreReadyCallback = viewsAreReadyCallback;
-        this.viewsAreReadyCallback.nearbyFragmentAndMapViewReady1();
+        this.viewsAreReadyCallback.nearbyFragmentsAreReady();
 
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
index 64a6d0116..f0a109537 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
@@ -74,8 +74,8 @@ public class NearbyParentFragmentPresenter
      * Initializes nearby operations if tab selected, otherwise just sets nearby views are ready
      */
     @Override
-    public void nearbyFragmentAndMapViewReady1() {
-        Timber.d("Nearby map view ready");
+    public void nearbyFragmentsAreReady() {
+        Timber.d("Nearby fragments are ready to be used by presenter");
         nearbyViewsAreReady = true;
         // The condition for initialize operations is both having views ready and tab is selected
         if (onTabSelected) {
@@ -83,12 +83,14 @@ public class NearbyParentFragmentPresenter
         }
     }
 
+    /**
+     * Will be called when map view is created and ready to be used.
+     */
     @Override
-    public void nearbyFragmentAndMapViewReady2() {
+    public void nearbyMapViewReady() {
+        Timber.d("Nearby map view is created and ready");
         updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED, null);
-        //initializeNearbyOperations();
         // TODO: document this prpoblem, if updateMapAndList is not called at checkGPS then this method never called, setup map view never ends
-        // TODO: add search this area thing here
         this.nearbyParentFragmentView.addSearchThisAreaButtonAction();
         this.nearbyMapFragmentView.addOnCameraMoveListener(onCameraMove(getCameraTarget()));
     }