diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index ed2ded212..5fdad226d 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -287,7 +287,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     return validateNames();
   }
 
-  private boolean beforeSavingValidation() {
+  private boolean beforeSavingValidation()
+  {
     // Validation to make sure address features have a house number
     if (!Editor.nativeCheckHouseNumberWhenIsAddress())
     {
diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index 4b43c0155..c66075277 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -13,10 +13,6 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
@@ -28,6 +24,8 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textview.MaterialTextView;
 
 public class HelpFragment extends BaseMwmFragment implements View.OnClickListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
index 5332bb323..2dce832a6 100644
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -12,7 +12,6 @@ import android.widget.ExpandableListView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
-
 import app.organicmaps.R;
 import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
 import app.organicmaps.base.BaseMwmDialogFragment;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index 377bbd33b..926bb34ae 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -141,7 +141,8 @@ public class RoutingPlanController extends ToolbarController
     setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
     setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
     //    setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
-    setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
+    setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px,
+                      this::onTransitModeSelected);
     setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
     setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
   }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index e3c938785..6c3f573b4 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -493,8 +493,8 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseV
   return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env,
+                                                                                                      jclass clazz)
 {
   return g_editableMapObject.CheckHouseNumberWhenIsAddress();
 }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
index da79f6b3e..6e582bd9c 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
@@ -68,10 +68,7 @@ public final class OsmOAuth
 
   public static void clearAuthorization()
   {
-    mPrefs.edit()
-        .remove(PREF_OSM_USERNAME)
-        .remove(PREF_OSM_OAUTH2_TOKEN)
-        .apply();
+    mPrefs.edit().remove(PREF_OSM_USERNAME).remove(PREF_OSM_OAUTH2_TOKEN).apply();
   }
 
   @NonNull
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
index ac47b448e..01328eed8 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -96,7 +96,8 @@ public class LocationHelper implements BaseLocationProvider.Listener
     }
   };
 
-  public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper, @NonNull LocationProviderFactory locationProviderFactory)
+  public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper,
+                        @NonNull LocationProviderFactory locationProviderFactory)
   {
     mContext = context;
     mSensorHelper = sensorHelper;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
index 77023479a..53a7b9446 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
@@ -2,8 +2,8 @@ package app.organicmaps.sdk.maplayer;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
index 0eb5bf3bf..99b926330 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
@@ -11,8 +11,8 @@ import android.os.storage.StorageVolume;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.StorageUtils;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
index 64a1e1c0a..065feec5a 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
@@ -16,8 +16,8 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.BuildConfig;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ROMUtils;
 import app.organicmaps.sdk.util.StringUtils;