diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index b0c50a5ed6..7789e85413 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -315,7 +315,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     {
       // Remove old OAuth v1 secrets
       OsmOAuth.clearOAuth1Credentials(this);
-      EditorHostFragment.clearNoobAlertFlag(this);
 
       // Notify user to re-login
       dismissAlertDialog();
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
index 2a49f0d6e3..62dfdb0c0a 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -66,12 +66,6 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
 
   private static final String NOOB_ALERT_SHOWN = "Alert_for_noob_was_shown";
 
-  public static void clearNoobAlertFlag(@NonNull Context context) {
-    MwmApplication.prefs(context).edit()
-            .remove(NOOB_ALERT_SHOWN)
-            .apply();
-  }
-
   /**
    *   Used in MultilanguageAdapter to show, select and remove items.
    */
diff --git a/editor/osm_auth.cpp b/editor/osm_auth.cpp
index 635a6720a9..7a09a20cd9 100644
--- a/editor/osm_auth.cpp
+++ b/editor/osm_auth.cpp
@@ -40,7 +40,7 @@ string FindOauthCode(string const & redirectUri)
   auto const url = url::Url::FromString(redirectUri);
   string const * oauth2code = url.GetParamValue("code");
 
-  if(oauth2code == nullptr || oauth2code->empty())
+  if (!oauth2code || oauth2code->empty())
     return {};
 
   return *oauth2code;
@@ -54,7 +54,7 @@ string FindAccessToken(string const & body)
   if (json_is_object(root.get()))
   {
     json_t * token_node = json_object_get(root.get(), "access_token");
-    if(json_is_string(token_node))
+    if (json_is_string(token_node))
       return json_string_value(token_node);
   }
 
@@ -141,7 +141,7 @@ OsmOAuth::SessionID OsmOAuth::FetchSessionId(string const & subUrl, string const
     MYTHROW(FetchSessionIdError, (DebugPrint(request)));
 
   SessionID sid = { request.CombinedCookies(), FindAuthenticityToken(request.ServerResponse()) };
-  if (sid.m_cookies.empty() || sid.m_authenticity_token.empty())
+  if (sid.m_cookies.empty() || sid.m_authenticityToken.empty())
     MYTHROW(FetchSessionIdError, ("Cookies and/or token are empty for request", DebugPrint(request)));
   return sid;
 }
@@ -163,7 +163,7 @@ bool OsmOAuth::LoginUserPassword(string const & login, string const & password,
     {"password", password},
     {"referer", "/"},
     {"commit", "Login"},
-    {"authenticity_token", sid.m_authenticity_token}
+    {"authenticity_token", sid.m_authenticityToken}
   });
   HttpClient request(m_baseUrl + "/login");
   request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
@@ -255,7 +255,8 @@ string OsmOAuth::FetchRequestToken(SessionID const & sid) const
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("FetchRequestToken Network error while connecting to", request.UrlRequested()));
 
-  if (request.WasRedirected()) {
+  if (request.WasRedirected())
+  {
     if (request.UrlReceived().find(m_oauth2params.m_redirectUri) != 0)
       MYTHROW(OsmOAuth::NetworkError, ("FetchRequestToken Redirect url han unexpected prefix", request.UrlReceived()));
 
@@ -266,7 +267,8 @@ string OsmOAuth::FetchRequestToken(SessionID const & sid) const
       MYTHROW(OsmOAuth::NetworkError, ("FetchRequestToken Redirect url has no 'code' parameter", request.UrlReceived()));
     return oauthCode;
   }
-  else {
+  else
+  {
     if (request.ErrorCode() != HTTP::OK)
       MYTHROW(FetchRequestTokenServerError, (DebugPrint(request)));
 
@@ -332,7 +334,7 @@ bool OsmOAuth::ResetPassword(string const & email) const
   SessionID const sid = FetchSessionId(kForgotPasswordUrlPart);
   auto params = BuildPostRequest({
     {"email", email},
-    {"authenticity_token", sid.m_authenticity_token},
+    {"authenticity_token", sid.m_authenticityToken},
     {"commit", "Reset password"},
   });
   HttpClient request(m_baseUrl + kForgotPasswordUrlPart);
diff --git a/editor/osm_auth.hpp b/editor/osm_auth.hpp
index a429860eba..2c80be851e 100644
--- a/editor/osm_auth.hpp
+++ b/editor/osm_auth.hpp
@@ -108,7 +108,7 @@ private:
   struct SessionID
   {
     std::string m_cookies;
-    std::string m_authenticity_token;
+    std::string m_authenticityToken;
   };
 
   /// OAuth2 parameters (including secret) for application.
diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm
index 9ed9c7d133..9e2ecf63ec 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm
@@ -10,8 +10,7 @@ static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin";
 
 + (instancetype)alert
 {
-  MWMOsmReauthAlert * alert =
-      [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject;
+  MWMOsmReauthAlert * alert = [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject;
 
   alert.messageLabel.userInteractionEnabled = YES;
   alert.messageLabel.attributedText = [self buildAlertMessage];
@@ -53,8 +52,7 @@ static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin";
 - (IBAction)osmTap
 {
   [self close:^{
-    [self.alertController.ownerViewController performSegueWithIdentifier:kMap2OsmLoginSegue
-                                                                  sender:nil];
+    [self.alertController.ownerViewController performSegueWithIdentifier:kMap2OsmLoginSegue sender:nil];
   }];
 }
 
diff --git a/platform/http_client.cpp b/platform/http_client.cpp
index 25e462ece1..4942f06548 100644
--- a/platform/http_client.cpp
+++ b/platform/http_client.cpp
@@ -75,9 +75,9 @@ HttpClient & HttpClient::SetCookies(string const & cookies)
   return *this;
 }
 
-HttpClient & HttpClient::SetFollowRedirects(bool follow_redirects)
+HttpClient & HttpClient::SetFollowRedirects(bool followRedirects)
 {
-  m_followRedirects = follow_redirects;
+  m_followRedirects = followRedirects;
   return *this;
 }
 
diff --git a/platform/http_client_apple.mm b/platform/http_client_apple.mm
index 31f02e290f..db817b6162 100644
--- a/platform/http_client_apple.mm
+++ b/platform/http_client_apple.mm
@@ -52,8 +52,7 @@ willPerformHTTPRedirection:(NSHTTPURLResponse *)response
 @implementation RedirectDelegate
 - (instancetype)init:(BOOL)followRedirects
 {
-  self = [super init];
-  if (self)
+  if (self = [super init])
     _followRedirects = followRedirects;
   
   return self;
@@ -65,10 +64,10 @@ willPerformHTTPRedirection:(NSHTTPURLResponse *)response
                 newRequest:(NSURLRequest *)newRequest
          completionHandler:(void (^)(NSURLRequest *))completionHandler
 {
-    if (!_followRedirects && response.statusCode >= 300 && response.statusCode < 400)
-        completionHandler(nil);
-    else
-        completionHandler(newRequest);
+  if (!_followRedirects && response.statusCode >= 300 && response.statusCode < 400)
+    completionHandler(nil);
+  else
+    completionHandler(newRequest);
 }
 @end
 
diff --git a/platform/http_client_curl.cpp b/platform/http_client_curl.cpp
index d969385374..ce0b11ad3d 100644
--- a/platform/http_client_curl.cpp
+++ b/platform/http_client_curl.cpp
@@ -278,7 +278,7 @@ bool HttpClient::RunHttpRequest()
     if (m_outputFile.empty())
       m_serverResponse = ReadFileAsString(rfile);
   }
-  else if(m_followRedirects)
+  else if (m_followRedirects)
   {
     // Follow HTTP redirect.
     // TODO(AlexZ): Should we check HTTP redirect code here?
diff --git a/qt/osm_auth_dialog.cpp b/qt/osm_auth_dialog.cpp
index e8894b3f1d..46216604dd 100644
--- a/qt/osm_auth_dialog.cpp
+++ b/qt/osm_auth_dialog.cpp
@@ -123,7 +123,7 @@ void OsmAuthDialog::OnAction()
   }
   else
   {
-    settings::Set(kOauthTokenSetting, std::string());
+    settings::Set(kOauthTokenSetting, {});
 
     SwitchToLogin(this);
   }
diff --git a/tools/python/oauth2-flow/oauth2_flow.py b/tools/python/oauth2-flow/oauth2_flow.py
index e05b819578..45ed1a3b86 100644
--- a/tools/python/oauth2-flow/oauth2_flow.py
+++ b/tools/python/oauth2-flow/oauth2_flow.py
@@ -11,10 +11,10 @@ logging.basicConfig(level=logging.DEBUG, format='%(asctime)s [%(levelname)-5s] %
 """
 osmHost = "www.openstreetmap.org"
 OAuthClientId = "nw9bW3nZ-q99SXzgnH-dlED3ueDSmFPtxl33n3hDwFU"
-clientSecret = "nIxwFx1NXIx9lKoNmb7lAoHd9ariGMf46PtU_YG558c"
-redirectUri = "om://oauth2/osm/callback"
-response_type = "code"
-scope = "read_prefs"
+OAuthClientSecret = "nIxwFx1NXIx9lKoNmb7lAoHd9ariGMf46PtU_YG558c"
+OAuthRedirectUri = "om://oauth2/osm/callback"
+OAuthResponseType = "code"
+OAuthScope = "read_prefs"
 """
 
 # Dev enviroment