diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 93937e65c6..40daceaaac 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -36,13 +36,17 @@ namespace ftype
       static string const negativeValues[] = { "no", "false", "-1" };
       // If second component of these pairs is true we need to process this key else ignore it
       static pair<string const, bool const> const processedKeys[] = {
-        {"description", true}
-        ,{"cycleway", true}     // [highway=primary][cycleway=lane] parsed as [highway=cycleway]
-        ,{"proposed", true}     // [highway=proposed][proposed=primary] parsed as [highway=primary]
-        ,{"construction", true} // [highway=primary][construction=primary] parsed as [highway=construction]
-        ,{"layer", false}       // process in any case
-        ,{"oneway", false}      // process in any case
-      };
+          {"description", true},
+          // [highway=primary][cycleway=lane] parsed as [highway=cycleway]
+          {"cycleway", true},
+          // [highway=proposed][proposed=primary] parsed as [highway=primary]
+          {"proposed", true},
+          // [highway=primary][construction=primary] parsed as [highway=construction]
+          {"construction", true},
+          // process in any case
+          {"layer", false},
+          // process in any case
+          {"oneway", false}};
 
       // Ignore empty key.
       if (k.empty())
diff --git a/generator/osm_translator.hpp b/generator/osm_translator.hpp
index 24a1aac724..d9fbe7f26c 100644
--- a/generator/osm_translator.hpp
+++ b/generator/osm_translator.hpp
@@ -234,8 +234,8 @@ class OsmToFeatureTranslator
 
     FeatureBuilder1::TGeometry & GetHoles()
     {
-      ASSERT ( m_holes.empty(), ("Can call only once") );
-      m_merger.ForEachArea(false, [this] (FeatureBuilder1::TPointSeq & v, vector<uint64_t> const &)
+      ASSERT(m_holes.empty(), ("Can call only once"));
+      m_merger.ForEachArea(false, [this](FeatureBuilder1::TPointSeq & v, vector<uint64_t> const &)
       {
         m_holes.push_back(FeatureBuilder1::TPointSeq());
         m_holes.back().swap(v);
diff --git a/generator/ways_merger.hpp b/generator/ways_merger.hpp
index f1080de616..e63117dad1 100644
--- a/generator/ways_merger.hpp
+++ b/generator/ways_merger.hpp
@@ -50,7 +50,7 @@ public:
           ids.push_back(e->m_wayOsmId);
 
         e->ForEachPointOrdered(id, [this, &points](uint64_t id)
-                               {
+        {
           m2::PointD pt;
           if (m_holder.GetNode(id, pt.y, pt.x))
             points.push_back(pt);
diff --git a/geometry/region2d.hpp b/geometry/region2d.hpp
index 1e3d3563c3..e4ca81be66 100644
--- a/geometry/region2d.hpp
+++ b/geometry/region2d.hpp
@@ -20,8 +20,8 @@ namespace m2
       template <class PointT>
       bool EqualPoints(PointT const & p1, PointT const & p2) const
       {
-        return my::AlmostEqualAbs(p1.x, p2.x, (typename PointT::value_type)1e-7) &&
-               my::AlmostEqualAbs(p1.y, p2.y, (typename PointT::value_type)1e-7);
+        return my::AlmostEqualAbs(p1.x, p2.x, static_cast<typename PointT::value_type>(1e-7)) &&
+               my::AlmostEqualAbs(p1.y, p2.y, static_cast<typename PointT::value_type>(1e-7));
       }
       template <class CoordT>
       bool EqualZero(CoordT val, CoordT exp) const