diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index 34153ef21f..8d2b855e65 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -36,7 +36,6 @@ namespace df
       default:
         return drule::count_of_rules;
       }
-
     }
 
     // ==================================== //
@@ -180,18 +179,16 @@ namespace df
                                           feature::EGeomType type,
                                           bool auxCaptionExists)
   {
-    if (auxCaptionExists == false &&
-        m_auxText.empty() == false   &&
-        type != feature::GEOM_LINE)
+    if (!auxCaptionExists && !m_auxText.empty() && type != feature::GEOM_LINE)
     {
       f.GetReadableName(m_mainText);
       if (m_mainText == m_auxText)
         m_auxText.clear();
     }
 
-    if (m_houseNumber.empty() == false)
+    if (!m_houseNumber.empty())
     {
-      if (m_mainText.empty() == true || m_houseNumber.find(m_mainText) != string::npos)
+      if (m_mainText.empty() || m_houseNumber.find(m_mainText) != string::npos)
         m_houseNumber.swap(m_mainText);
       else
         m_mainText += ("(" + m_houseNumber + ")");
@@ -225,8 +222,7 @@ namespace df
 
   void CaptionDescription::SwapCaptions(const int zoomLevel)
   {
-    if (zoomLevel <= scales::GetUpperWorldScale() &&
-        m_auxText.empty() == false)
+    if (zoomLevel <= scales::GetUpperWorldScale() && !m_auxText.empty())
     {
       m_mainText.swap(m_auxText);
       m_auxText.clear();
@@ -322,11 +318,14 @@ namespace df
     feature::EGeomType mainGeomType = feature::EGeomType(geomType.first);
 
     switch (mainGeomType) {
-    case feature::GEOM_POINT: s.RaisePointStyleFlag();
+    case feature::GEOM_POINT:
+      s.RaisePointStyleFlag();
       break;
-    case feature::GEOM_LINE : s.RaiseLineStyleFlag();
+    case feature::GEOM_LINE :
+      s.RaiseLineStyleFlag();
       break;
-    case feature::GEOM_AREA : s.RaiseAreaStyleFlag();
+    case feature::GEOM_AREA :
+      s.RaiseAreaStyleFlag();
       break;
     default:
       ASSERT(false, ());
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 69d72f12e1..38a4c2688e 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -224,12 +224,10 @@ public:
     ForEachInIntervals(implFunctor, covering::FullCover, m2::RectD::GetInfiniteRect(), scale);
   }
 
+  // "features" must be sorted using FeatureID::operator< as predicate
   template <typename F>
   void ReadFeatures(F & f, vector<FeatureID> const & features) const
   {
-    if (features.empty())
-      return;
-
     size_t currentIndex = 0;
     while (currentIndex < features.size())
       currentIndex = ReadFeatureRange(f, features, currentIndex);
@@ -253,6 +251,7 @@ public:
 
 private:
 
+  // "features" must be sorted using FeatureID::operator< as predicate
   template <typename F>
   size_t ReadFeatureRange(F & f, vector<FeatureID> const & features, size_t index) const
   {