diff --git a/coding/multilang_utf8_string.cpp b/coding/multilang_utf8_string.cpp
index 7ce1325830..f27930a769 100644
--- a/coding/multilang_utf8_string.cpp
+++ b/coding/multilang_utf8_string.cpp
@@ -2,6 +2,11 @@
 
 #include "defines.hpp"
 
+// TODO(AlexZ): Review and replace invalid languages which does not map correctly to
+// iOS/Android locales/UI by valid and more popular ones.
+// Languages below were choosen after sorting name:<lang> tags in 2011.
+// Note, that it's not feasible to increase languages number here due to
+// our current encoding (6 bit to store language code).
 static char const * gLangs[] = {
     "default",
     "en", "ja", "fr", "ko_rm", "ar", "de", "int_name", "ru", "sv", "zh", "fi", "be", "ka", "ko",
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index d07dea2c36..f2f4819331 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -212,6 +212,8 @@ int8_t CategoriesHolder::MapLocaleToInteger(string const & locale)
     char const * m_name;
     int8_t m_code;
   };
+  // TODO(AlexZ): These constants should be updated when adding new
+  // translation into categories.txt
   static const Mapping mapping[] = {
     {"en", 1 },
     {"ru", 2 },
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index bc40766f35..d46961bdf0 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -255,7 +255,7 @@ struct BestMatchedLangNames
 
   bool operator()(int8_t code, string const & name)
   {
-    static int8_t defaultCode = StringUtf8Multilang::GetLangIndex("default");
+    static int8_t const defaultCode = StringUtf8Multilang::GetLangIndex("default");
     static int8_t const nativeCode = StringUtf8Multilang::GetLangIndex(languages::GetCurrentNorm());
     static int8_t const intCode = StringUtf8Multilang::GetLangIndex("int_name");
     static int8_t const englishCode = StringUtf8Multilang::GetLangIndex("en");
diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp
index 1079ba19ff..164748f53a 100644
--- a/indexer/mwm_set.cpp
+++ b/indexer/mwm_set.cpp
@@ -73,7 +73,6 @@ MwmSet::MwmHandle & MwmSet::MwmHandle::operator=(MwmHandle && handle)
   return *this;
 }
 
-
 MwmSet::MwmId MwmSet::GetMwmIdByCountryFileImpl(CountryFile const & countryFile) const
 {
   string const & name = countryFile.GetNameWithoutExt();