diff --git a/android/jni/com/mapswithme/country/CountryTree.cpp b/android/jni/com/mapswithme/country/CountryTree.cpp
index e67cbbfea8..5422c8b408 100644
--- a/android/jni/com/mapswithme/country/CountryTree.cpp
+++ b/android/jni/com/mapswithme/country/CountryTree.cpp
@@ -136,8 +136,6 @@ extern "C"
     g_framework->ResetCountryTreeListener();
   }
 
-  // FIXME (trashkalmar): Add proper logic
-
   JNIEXPORT jboolean JNICALL
   Java_com_mapswithme_country_CountryTree_isDownloadableGroup(JNIEnv * env, jclass clazz)
   {
diff --git a/map/framework.cpp b/map/framework.cpp
index 9088e658a2..61d385e980 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -530,7 +530,7 @@ void Framework::RegisterAllMaps()
   m_storage.RegisterAllLocalMaps();
 
   // Fast migrate if possible.
-  if(platform::migrate::NeedMigrate())
+  if (platform::migrate::NeedMigrate())
   {
     bool disableFastMigrate = false;
     Settings::Get("DisableFastMigrate", disableFastMigrate);
@@ -1096,7 +1096,7 @@ void Framework::InitCountryInfoGetter()
   Platform const & platform = GetPlatform();
   try
   {
-    if(platform::migrate::NeedMigrate())
+    if (platform::migrate::NeedMigrate())
     {
       m_infoGetter.reset(new storage::CountryInfoReader(platform.GetReader(PACKED_POLYGONS_FILE),
                                                         platform.GetReader(COUNTRIES_FILE)));
diff --git a/platform/mwm_version.cpp b/platform/mwm_version.cpp
index 2d92707439..d5acde1b16 100644
--- a/platform/mwm_version.cpp
+++ b/platform/mwm_version.cpp
@@ -76,7 +76,7 @@ uint32_t ReadVersionTimestamp(ModelReaderPtr const & reader)
 
 bool IsSingleMwm(int64_t version)
 {
-  // @TODO(bykoianko) Check this version and move if necessary before small mwm release.
+  #pragma message("Check this version and move if necessary before small mwm release.")
   int64_t constexpr kMinSingleMwmVersion = 160107;
   return version >= kMinSingleMwmVersion || version == 0 /* Version of mwm in the root directory. */;
 }
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 1955eb8a89..f856fb983e 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -489,7 +489,7 @@ void Storage::LoadCountriesFile(bool forceReload)
   if (m_countries.SiblingsCount() == 0)
   {
     string json;
-    string name = migrate::NeedMigrate() ? COUNTRIES_FILE : COUNTRIES_MIGRATE_FILE;
+    string const name = migrate::NeedMigrate() ? COUNTRIES_FILE : COUNTRIES_MIGRATE_FILE;
     ReaderPtr<Reader>(GetPlatform().GetReader(name)).ReadAsString(json);
     m_currentVersion = LoadCountries(json, m_countries);
     if (m_currentVersion < 0)
diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp
index c90d4eea8a..05b93de66c 100644
--- a/storage/storage_tests/storage_tests.cpp
+++ b/storage/storage_tests/storage_tests.cpp
@@ -349,26 +349,26 @@ UNIT_TEST(StorageTest_SingleCountryDownloading)
   TaskRunner runner;
   InitStorage(storage, runner);
 
-  TIndex const azerbaijanIndex = storage.FindIndexByFile("Angola");
-  TEST(azerbaijanIndex.IsValid(), ());
+  TIndex const index = storage.FindIndexByFile("Angola");
+  TEST(index.IsValid(), ());
 
-  CountryFile azerbaijanFile = storage.GetCountryFile(azerbaijanIndex);
-  storage.DeleteCountry(azerbaijanIndex, MapOptions::MapWithCarRouting);
+  CountryFile azerbaijanFile = storage.GetCountryFile(index);
+  storage.DeleteCountry(index, MapOptions::MapWithCarRouting);
 
   {
     MY_SCOPE_GUARD(cleanupCountryFiles,
-                   bind(&Storage::DeleteCountry, &storage, azerbaijanIndex, MapOptions::Map));
+                   bind(&Storage::DeleteCountry, &storage, index, MapOptions::Map));
     unique_ptr<CountryDownloaderChecker> checker =
-        AbsentCountryDownloaderChecker(storage, azerbaijanIndex, MapOptions::MapWithCarRouting);
+        AbsentCountryDownloaderChecker(storage, index, MapOptions::MapWithCarRouting);
     checker->StartDownload();
     runner.Run();
   }
 
   {
-    MY_SCOPE_GUARD(cleanupCountryFiles, bind(&Storage::DeleteCountry, &storage, azerbaijanIndex,
+    MY_SCOPE_GUARD(cleanupCountryFiles, bind(&Storage::DeleteCountry, &storage, index,
                                              MapOptions::MapWithCarRouting));
     unique_ptr<CountryDownloaderChecker> checker =
-        AbsentCountryDownloaderChecker(storage, azerbaijanIndex, MapOptions::MapWithCarRouting);
+        AbsentCountryDownloaderChecker(storage, index, MapOptions::MapWithCarRouting);
     checker->StartDownload();
     runner.Run();
   }
@@ -380,22 +380,22 @@ UNIT_TEST(StorageTest_TwoCountriesDownloading)
   TaskRunner runner;
   InitStorage(storage, runner);
 
-  TIndex const uruguayIndex = storage.FindIndexByFile("Yemen");
-  TEST(uruguayIndex.IsValid(), ());
-  storage.DeleteCountry(uruguayIndex, MapOptions::Map);
+  TIndex const index1 = storage.FindIndexByFile("Yemen");
+  TEST(index1.IsValid(), ());
+  storage.DeleteCountry(index1, MapOptions::Map);
   MY_SCOPE_GUARD(cleanupUruguayFiles,
-                 bind(&Storage::DeleteCountry, &storage, uruguayIndex, MapOptions::Map));
+                 bind(&Storage::DeleteCountry, &storage, index1, MapOptions::Map));
 
-  TIndex const venezuelaIndex = storage.FindIndexByFile("Angola");
-  TEST(venezuelaIndex.IsValid(), ());
-  storage.DeleteCountry(venezuelaIndex, MapOptions::MapWithCarRouting);
-  MY_SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, venezuelaIndex,
+  TIndex const index2 = storage.FindIndexByFile("Angola");
+  TEST(index2.IsValid(), ());
+  storage.DeleteCountry(index2, MapOptions::MapWithCarRouting);
+  MY_SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, index2,
                                              MapOptions::MapWithCarRouting));
 
   unique_ptr<CountryDownloaderChecker> uruguayChecker =
-      AbsentCountryDownloaderChecker(storage, uruguayIndex, MapOptions::Map);
+      AbsentCountryDownloaderChecker(storage, index1, MapOptions::Map);
   unique_ptr<CountryDownloaderChecker> venezuelaChecker =
-      QueuedCountryDownloaderChecker(storage, venezuelaIndex, MapOptions::MapWithCarRouting);
+      QueuedCountryDownloaderChecker(storage, index2, MapOptions::MapWithCarRouting);
   uruguayChecker->StartDownload();
   venezuelaChecker->StartDownload();
   runner.Run();