diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index 8c9fd4d6e5..7331aa40aa 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -67,14 +67,14 @@ private:
   generator::SrtmTileManager m_srtmManager;
   TFeatureAltitudeVec m_featureAltitudes;
 };
-} // namespace
+}  // namespace
 
 namespace routing
 {
 void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, string const & countryName)
 {
   LOG(LINFO, ("srtmPath =", srtmPath, "baseDir =", baseDir, "countryName =", countryName));
-//  string const altPath = baseDir + countryName + "." + ALTITUDE_FILE_TAG;
+  //  string const altPath = baseDir + countryName + "." + ALTITUDE_FILE_TAG;
   string const mwmPath = baseDir + countryName + DATA_FILE_EXTENSION;
 
   // Writing section with altitude information.
@@ -95,4 +95,4 @@ void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, string
     LOG(LINFO, ("Altitude was written for", featureAltitudes.size(), "features."));
   }
 }
-} // namespace routing
+}  // namespace routing
diff --git a/generator/altitude_generator.hpp b/generator/altitude_generator.hpp
index 42651b8c59..0133d401cb 100644
--- a/generator/altitude_generator.hpp
+++ b/generator/altitude_generator.hpp
@@ -4,5 +4,6 @@
 
 namespace routing
 {
-void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, string const & countryName);
-} // namespace routing
+void BuildRoadAltitudes(string const & srtmPath, string const & baseDir,
+                        string const & countryName);
+}  // namespace routing
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 02da78143d..ffd5e7d370 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -71,7 +71,9 @@ DEFINE_string(user_resource_path, "", "User defined resource path for classifica
 DEFINE_string(booking_data, "", "Path to booking data in .tsv format");
 DEFINE_string(booking_reference_path, "", "Path to mwm dataset for match booking addresses");
 DEFINE_uint64(planet_version, my::SecondsSinceEpoch(), "Version as seconds since epoch, by default - now");
-DEFINE_string(srtm_path, "", "Path to srtm directory. If When set generates section with altitude information about roads.");
+DEFINE_string(
+    srtm_path, "",
+    "Path to srtm directory. If When set generates section with altitude information about roads.");
 
 int main(int argc, char ** argv)
 {
diff --git a/generator/srtm_parser.hpp b/generator/srtm_parser.hpp
index b70bcbface..ff1fdce283 100644
--- a/generator/srtm_parser.hpp
+++ b/generator/srtm_parser.hpp
@@ -28,7 +28,10 @@ public:
   static string GetBase(ms::LatLon coord);
 
 private:
-  inline feature::TAltitude const * Data() const { return reinterpret_cast<feature::TAltitude const *>(m_data.data()); };
+  inline feature::TAltitude const * Data() const
+  {
+    return reinterpret_cast<feature::TAltitude const *>(m_data.data());
+  };
 
   inline size_t Size() const { return m_data.size() / sizeof(feature::TAltitude); }
 
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 7153bc6476..b9cd39253f 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -302,7 +302,8 @@ void FeatureType::Deserialize(feature::LoaderBase * pLoader, TBuffer buffer)
 
   m_pLoader->InitFeature(this);
 
-  m_header2Parsed = m_pointsParsed = m_trianglesParsed = m_metadataParsed = m_altitudeParsed = false;
+  m_header2Parsed = m_pointsParsed = m_trianglesParsed = m_metadataParsed = m_altitudeParsed =
+      false;
 
   m_innerStats.MakeZero();
 }
diff --git a/indexer/feature_altitude.hpp b/indexer/feature_altitude.hpp
index 916e88f04b..393b4777dd 100644
--- a/indexer/feature_altitude.hpp
+++ b/indexer/feature_altitude.hpp
@@ -24,7 +24,10 @@ class Altitude
 {
 public:
   Altitude() = default;
-  Altitude(uint32_t featureId, Altitudes const & altitudes) : m_featureId(featureId), m_altitudes(altitudes) {}
+  Altitude(uint32_t featureId, Altitudes const & altitudes)
+    : m_featureId(featureId), m_altitudes(altitudes)
+  {
+  }
 
   template <class TSink>
   void Serialize(TSink & sink) const
@@ -42,9 +45,10 @@ public:
 
 private:
   /// @TODO Note. Feature id is located here because there's no index for altitudes.
-  /// There's only pairs sorted by feature id. Before merging to master some index has to be implemented.
+  /// There's only pairs sorted by feature id. Before merging to master some index has to be
+  /// implemented.
   /// Don't forget to remove |m_featureId|.
   uint32_t m_featureId = 0;
   Altitudes m_altitudes;
 };
-} // namespace feature
+}  // namespace feature
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp
index 950f134959..4c6609272e 100644
--- a/indexer/feature_loader.cpp
+++ b/indexer/feature_loader.cpp
@@ -309,13 +309,12 @@ void LoaderCurrent::ParseAltitude()
   try
   {
     DDVector<TAltitudeIndexEntry, FilesContainerR::TReader> idx(m_Info.GetAltitudeReader());
-    auto it = lower_bound(
-        idx.begin(), idx.end(),
-        TAltitudeIndexEntry{static_cast<uint32_t>(m_pF->m_id.m_index), 0, 0},
-        [](TAltitudeIndexEntry const & v1, TAltitudeIndexEntry const & v2)
-        {
-          return v1.featureId < v2.featureId;
-        });
+    auto it = lower_bound(idx.begin(), idx.end(),
+                          TAltitudeIndexEntry{static_cast<uint32_t>(m_pF->m_id.m_index), 0, 0},
+                          [](TAltitudeIndexEntry const & v1, TAltitudeIndexEntry const & v2)
+    {
+      return v1.featureId < v2.featureId;
+    });
     if (it == idx.end())
       return;
 
diff --git a/indexer/old/feature_loader_101.hpp b/indexer/old/feature_loader_101.hpp
index 7c07657013..83f74b8853 100644
--- a/indexer/old/feature_loader_101.hpp
+++ b/indexer/old/feature_loader_101.hpp
@@ -36,8 +36,8 @@ namespace old_101 { namespace feature
     void ParseHeader2() override;
     uint32_t ParseGeometry(int scale) override;
     uint32_t ParseTriangles(int scale) override;
-    void ParseMetadata() override {} /// not supported in this version
-    void ParseAltitude() override {} /// not supported in this version
+    void ParseMetadata() override {}  /// not supported in this version
+    void ParseAltitude() override {}  /// not supported in this version
   };
 }
 }
diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp
index a59ed392e7..90546fd332 100644
--- a/routing/features_road_graph.cpp
+++ b/routing/features_road_graph.cpp
@@ -263,11 +263,12 @@ void FeaturesRoadGraph::ExtractRoadInfo(FeatureID const & featureId, FeatureType
   ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
   ft.ParseAltitude();
   // @TODO It's a temprarery solution until a vector of feature altitudes is saved in mwm.
-  bool const isAltidudeValid =
-      ft.GetAltitudes().begin != feature::kInvalidAltitude && ft.GetAltitudes().end != feature::kInvalidAltitude;
+  bool const isAltidudeValid = ft.GetAltitudes().begin != feature::kInvalidAltitude &&
+                               ft.GetAltitudes().end != feature::kInvalidAltitude;
   feature::TAltitude pointAlt = ft.GetAltitudes().begin;
   size_t const pointsCount = ft.GetPointsCount();
-  feature::TAltitude const diffAlt = isAltidudeValid ? (ft.GetAltitudes().end - ft.GetAltitudes().begin) / pointsCount : 0;
+  feature::TAltitude const diffAlt =
+      isAltidudeValid ? (ft.GetAltitudes().end - ft.GetAltitudes().begin) / pointsCount : 0;
 
   ri.m_junctions.clear();
   ri.m_junctions.resize(pointsCount);
diff --git a/routing/features_road_graph.hpp b/routing/features_road_graph.hpp
index e870d18859..1ca7957ecc 100644
--- a/routing/features_road_graph.hpp
+++ b/routing/features_road_graph.hpp
@@ -87,11 +87,10 @@ private:
   RoadInfo const & GetCachedRoadInfo(FeatureID const & featureId) const;
   // Searches a feature RoadInfo in the cache, and if does not find then takes passed feature and speed.
   // This version is used to prevent redundant feature loading when feature speed is known.
-  RoadInfo const & GetCachedRoadInfo(FeatureID const & featureId,
-                                     FeatureType const & ft,
+  RoadInfo const & GetCachedRoadInfo(FeatureID const & featureId, FeatureType const & ft,
                                      double speedKMPH) const;
-  void ExtractRoadInfo(FeatureID const & featureId, FeatureType const & ft,
-                       double speedKMPH, RoadInfo & ri) const;
+  void ExtractRoadInfo(FeatureID const & featureId, FeatureType const & ft, double speedKMPH,
+                       RoadInfo & ri) const;
 
   void LockFeatureMwm(FeatureID const & featureId) const;
 
diff --git a/routing/nearest_edge_finder.cpp b/routing/nearest_edge_finder.cpp
index 1e7b1b0e02..181eda1cf9 100644
--- a/routing/nearest_edge_finder.cpp
+++ b/routing/nearest_edge_finder.cpp
@@ -10,12 +10,7 @@
 
 namespace routing
 {
-
-NearestEdgeFinder::Candidate::Candidate()
-    : m_dist(numeric_limits<double>::max()),
-      m_segId(0)
-{
-}
+NearestEdgeFinder::Candidate::Candidate() : m_dist(numeric_limits<double>::max()), m_segId(0) {}
 
 NearestEdgeFinder::NearestEdgeFinder(m2::PointD const & point)
     : m_point(point)
@@ -45,11 +40,14 @@ void NearestEdgeFinder::AddInformationSource(FeatureID const & featureId, IRoadG
       res.m_segEnd = roadInfo.m_junctions[i];
       // @TODO res.m_projPoint.GetAltitude() is an altitude of |pt|. |pt| is a projection of m_point
       // to segment [res.m_segStart.GetPoint(), res.m_segEnd.GetPoint()].
-      // It's necessary to calculate exact value of res.m_projPoint.GetAltitude() by this information.
-      bool const isAltidudeValid = res.m_segStart.GetAltitude() != feature::kInvalidAltitude
-          && res.m_segEnd.GetAltitude() != feature::kInvalidAltitude;
-      feature::TAltitude const projPointAlt = isAltidudeValid ? static_cast<feature::TAltitude>((res.m_segStart.GetAltitude() + res.m_segEnd.GetAltitude()) / 2)
-                                                              : feature::kInvalidAltitude;
+      // It's necessary to calculate exact value of res.m_projPoint.GetAltitude() by this
+      // information.
+      bool const isAltidudeValid = res.m_segStart.GetAltitude() != feature::kInvalidAltitude &&
+                                   res.m_segEnd.GetAltitude() != feature::kInvalidAltitude;
+      feature::TAltitude const projPointAlt =
+          isAltidudeValid ? static_cast<feature::TAltitude>(
+                                (res.m_segStart.GetAltitude() + res.m_segEnd.GetAltitude()) / 2)
+                          : feature::kInvalidAltitude;
       res.m_projPoint = Junction(pt, projPointAlt);
     }
   }
@@ -58,7 +56,8 @@ void NearestEdgeFinder::AddInformationSource(FeatureID const & featureId, IRoadG
     m_candidates.push_back(res);
 }
 
-void NearestEdgeFinder::MakeResult(vector<pair<Edge, Junction>> & res, size_t const maxCountFeatures)
+void NearestEdgeFinder::MakeResult(vector<pair<Edge, Junction>> & res,
+                                   size_t const maxCountFeatures)
 {
   sort(m_candidates.begin(), m_candidates.end(), [](Candidate const & r1, Candidate const & r2)
   {
@@ -72,7 +71,8 @@ void NearestEdgeFinder::MakeResult(vector<pair<Edge, Junction>> & res, size_t co
   for (Candidate const & candidate : m_candidates)
   {
     res.emplace_back(Edge(candidate.m_fid, true /* forward */, candidate.m_segId,
-                          candidate.m_segStart, candidate.m_segEnd), candidate.m_projPoint);
+                          candidate.m_segStart, candidate.m_segEnd),
+                     candidate.m_projPoint);
     ++i;
     if (i == maxCountFeatures)
       break;
diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp
index a2e1ea414a..c362365400 100644
--- a/routing/road_graph.cpp
+++ b/routing/road_graph.cpp
@@ -66,9 +66,7 @@ void ReverseEdges(size_t beginIdx, IRoadGraph::TEdgeVector & edges)
 
 // Junction --------------------------------------------------------------------
 
-Junction::Junction()
-  : m_point(m2::PointD::Zero()), m_altitude(feature::kInvalidAltitude)
-{}
+Junction::Junction() : m_point(m2::PointD::Zero()), m_altitude(feature::kInvalidAltitude) {}
 
 Junction::Junction(m2::PointD const & point, feature::TAltitude altitude)
   : m_point(point), m_altitude(altitude)
@@ -146,19 +144,21 @@ IRoadGraph::RoadInfo::RoadInfo()
 {}
 
 IRoadGraph::RoadInfo::RoadInfo(RoadInfo && ri)
-    : m_junctions(move(ri.m_junctions)),
-      m_speedKMPH(ri.m_speedKMPH),
-      m_bidirectional(ri.m_bidirectional)
+  : m_junctions(move(ri.m_junctions))
+  , m_speedKMPH(ri.m_speedKMPH)
+  , m_bidirectional(ri.m_bidirectional)
 {}
 
-IRoadGraph::RoadInfo::RoadInfo(bool bidirectional, double speedKMPH, initializer_list<Junction> const & points)
-    : m_junctions(points), m_speedKMPH(speedKMPH), m_bidirectional(bidirectional)
+IRoadGraph::RoadInfo::RoadInfo(bool bidirectional, double speedKMPH,
+                               initializer_list<Junction> const & points)
+  : m_junctions(points), m_speedKMPH(speedKMPH), m_bidirectional(bidirectional)
 {}
 
 // IRoadGraph::CrossOutgoingLoader ---------------------------------------------
 void IRoadGraph::CrossOutgoingLoader::LoadEdges(FeatureID const & featureId, RoadInfo const & roadInfo)
 {
-  ForEachEdge(roadInfo, [&featureId, &roadInfo, this](size_t segId, Junction const & endJunction, bool forward)
+  ForEachEdge(roadInfo, [&featureId, &roadInfo, this](size_t segId, Junction const & endJunction,
+                                                      bool forward)
   {
     if (forward || roadInfo.m_bidirectional || m_mode == IRoadGraph::Mode::IgnoreOnewayTag)
       m_edges.emplace_back(featureId, forward, segId, m_cross, endJunction);
@@ -168,7 +168,8 @@ void IRoadGraph::CrossOutgoingLoader::LoadEdges(FeatureID const & featureId, Roa
 // IRoadGraph::CrossIngoingLoader ----------------------------------------------
 void IRoadGraph::CrossIngoingLoader::LoadEdges(FeatureID const & featureId, RoadInfo const & roadInfo)
 {
-  ForEachEdge(roadInfo, [&featureId, &roadInfo, this](size_t segId, Junction const & endJunction, bool forward)
+  ForEachEdge(roadInfo, [&featureId, &roadInfo, this](size_t segId, Junction const & endJunction,
+                                                      bool forward)
   {
     if (!forward || roadInfo.m_bidirectional || m_mode == IRoadGraph::Mode::IgnoreOnewayTag)
       m_edges.emplace_back(featureId, !forward, segId, endJunction, m_cross);
@@ -222,7 +223,8 @@ void IRoadGraph::ResetFakes()
   m_outgoingEdges.clear();
 }
 
-void IRoadGraph::AddFakeEdges(Junction const & junction, vector<pair<Edge, Junction>> const & vicinity)
+void IRoadGraph::AddFakeEdges(Junction const & junction,
+                              vector<pair<Edge, Junction>> const & vicinity)
 {
   for (auto const & v : vicinity)
   {
diff --git a/routing/road_graph.hpp b/routing/road_graph.hpp
index 00b86e670f..505376aed5 100644
--- a/routing/road_graph.hpp
+++ b/routing/road_graph.hpp
@@ -143,7 +143,8 @@ public:
     {
       for (size_t i = 0; i < roadInfo.m_junctions.size(); ++i)
       {
-        if (!my::AlmostEqualAbs(m_cross.GetPoint(), roadInfo.m_junctions[i].GetPoint(), kPointsEqualEpsilon))
+        if (!my::AlmostEqualAbs(m_cross.GetPoint(), roadInfo.m_junctions[i].GetPoint(),
+                                kPointsEqualEpsilon))
           continue;
 
         if (i < roadInfo.m_junctions.size() - 1)
@@ -172,7 +173,9 @@ public:
   {
   public:
     CrossOutgoingLoader(Junction const & cross, IRoadGraph::Mode mode, TEdgeVector & edges)
-      : ICrossEdgesLoader(cross, mode, edges) {}
+      : ICrossEdgesLoader(cross, mode, edges)
+    {
+    }
 
   private:
     // ICrossEdgesLoader overrides:
@@ -183,7 +186,9 @@ public:
   {
   public:
     CrossIngoingLoader(Junction const & cross, IRoadGraph::Mode mode, TEdgeVector & edges)
-      : ICrossEdgesLoader(cross, mode, edges) {}
+      : ICrossEdgesLoader(cross, mode, edges)
+    {
+    }
 
   private:
     // ICrossEdgesLoader overrides:
diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp
index 45f8fa7b3c..c602fbd453 100644
--- a/routing/routing_helpers.hpp
+++ b/routing/routing_helpers.hpp
@@ -10,8 +10,8 @@ namespace routing
 template <class TList>
 bool IsRoad(TList const & types)
 {
-  return CarModel::Instance().HasRoadType(types)
-         || PedestrianModel::DefaultInstance().HasRoadType(types)
-         || BicycleModel::DefaultInstance().HasRoadType(types);
+  return CarModel::Instance().HasRoadType(types) ||
+         PedestrianModel::DefaultInstance().HasRoadType(types) ||
+         BicycleModel::DefaultInstance().HasRoadType(types);
 }
-} // namespace rouing
+}  // namespace rouing
diff --git a/routing/routing_tests/astar_router_test.cpp b/routing/routing_tests/astar_router_test.cpp
index f6372bf326..3f7a125997 100644
--- a/routing/routing_tests/astar_router_test.cpp
+++ b/routing/routing_tests/astar_router_test.cpp
@@ -56,12 +56,10 @@ UNIT_TEST(AStarRouter_Graph2_Simple1)
   Junction const startPos = MakeJunctionForTesting(m2::PointD(0, 0));
   Junction const finalPos = MakeJunctionForTesting(m2::PointD(80, 55));
 
-  vector<Junction> const expected = {MakeJunctionForTesting(m2::PointD(0, 0)),
-                                     MakeJunctionForTesting(m2::PointD(5, 10)),
-                                     MakeJunctionForTesting(m2::PointD(5, 40)),
-                                     MakeJunctionForTesting(m2::PointD(18, 55)),
-                                     MakeJunctionForTesting(m2::PointD(39, 55)),
-                                     MakeJunctionForTesting(m2::PointD(80, 55))};
+  vector<Junction> const expected = {
+      MakeJunctionForTesting(m2::PointD(0, 0)),   MakeJunctionForTesting(m2::PointD(5, 10)),
+      MakeJunctionForTesting(m2::PointD(5, 40)),  MakeJunctionForTesting(m2::PointD(18, 55)),
+      MakeJunctionForTesting(m2::PointD(39, 55)), MakeJunctionForTesting(m2::PointD(80, 55))};
 
   TestAStarRouterMock(startPos, finalPos, expected);
 }
@@ -71,13 +69,11 @@ UNIT_TEST(AStarRouter_Graph2_Simple2)
   Junction const startPos = MakeJunctionForTesting(m2::PointD(80, 55));
   Junction const finalPos = MakeJunctionForTesting(m2::PointD(80, 0));
 
-  vector<Junction> const expected = {MakeJunctionForTesting(m2::PointD(80, 55)),
-                                     MakeJunctionForTesting(m2::PointD(39, 55)),
-                                     MakeJunctionForTesting(m2::PointD(37, 30)),
-                                     MakeJunctionForTesting(m2::PointD(70, 30)),
-                                     MakeJunctionForTesting(m2::PointD(70, 10)),
-                                     MakeJunctionForTesting(m2::PointD(70, 0)),
-                                     MakeJunctionForTesting(m2::PointD(80, 0))};
+  vector<Junction> const expected = {
+      MakeJunctionForTesting(m2::PointD(80, 55)), MakeJunctionForTesting(m2::PointD(39, 55)),
+      MakeJunctionForTesting(m2::PointD(37, 30)), MakeJunctionForTesting(m2::PointD(70, 30)),
+      MakeJunctionForTesting(m2::PointD(70, 10)), MakeJunctionForTesting(m2::PointD(70, 0)),
+      MakeJunctionForTesting(m2::PointD(80, 0))};
 
   TestAStarRouterMock(startPos, finalPos, expected);
 }
@@ -97,10 +93,9 @@ UNIT_TEST(AStarRouter_SimpleGraph_RouteIsFound)
   Junction const startPos = MakeJunctionForTesting(m2::PointD(0, 0));
   Junction const finalPos = MakeJunctionForTesting(m2::PointD(40, 100));
 
-  vector<Junction> const expected = {MakeJunctionForTesting(m2::PointD(0, 0)),
-                                     MakeJunctionForTesting(m2::PointD(0, 30)),
-                                     MakeJunctionForTesting(m2::PointD(0, 60)),
-                                     MakeJunctionForTesting(m2::PointD(40, 100))};
+  vector<Junction> const expected = {
+      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, 30)),
+      MakeJunctionForTesting(m2::PointD(0, 60)), MakeJunctionForTesting(m2::PointD(40, 100))};
 
   RouterDelegate delegate;
   RoutingResult<Junction> result;
@@ -120,30 +115,36 @@ UNIT_TEST(AStarRouter_SimpleGraph_RoutesInConnectedComponents)
   double const speedKMPH = graph.GetMaxSpeedKMPH();
 
   // Roads in the first connected component.
-  vector<IRoadGraph::RoadInfo> const roadInfo_1 =
-  {
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(10, 10)), MakeJunctionForTesting(m2::PointD(90, 10))}), // feature 0
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(90, 10)), MakeJunctionForTesting(m2::PointD(90, 90))}), // feature 1
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(90, 90)), MakeJunctionForTesting(m2::PointD(10, 90))}), // feature 2
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(10, 90)), MakeJunctionForTesting(m2::PointD(10, 10))}), // feature 3
+  vector<IRoadGraph::RoadInfo> const roadInfo_1 = {
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(10, 10)),
+                            MakeJunctionForTesting(m2::PointD(90, 10))}),  // feature 0
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(90, 10)),
+                            MakeJunctionForTesting(m2::PointD(90, 90))}),  // feature 1
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(90, 90)),
+                            MakeJunctionForTesting(m2::PointD(10, 90))}),  // feature 2
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(10, 90)),
+                            MakeJunctionForTesting(m2::PointD(10, 10))}),  // feature 3
   };
   vector<uint32_t> const featureId_1 = { 0, 1, 2, 3 }; // featureIDs in the first connected component
 
   // Roads in the second connected component.
-  vector<IRoadGraph::RoadInfo> const roadInfo_2 =
-  {
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(30, 30)), MakeJunctionForTesting(m2::PointD(70, 30))}), // feature 4
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(70, 30)), MakeJunctionForTesting(m2::PointD(70, 70))}), // feature 5
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(70, 70)), MakeJunctionForTesting(m2::PointD(30, 70))}), // feature 6
-    IRoadGraph::RoadInfo(true /* bidir */, speedKMPH, {
-        MakeJunctionForTesting(m2::PointD(30, 70)), MakeJunctionForTesting(m2::PointD(30, 30))}), // feature 7
+  vector<IRoadGraph::RoadInfo> const roadInfo_2 = {
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(30, 30)),
+                            MakeJunctionForTesting(m2::PointD(70, 30))}),  // feature 4
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(70, 30)),
+                            MakeJunctionForTesting(m2::PointD(70, 70))}),  // feature 5
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(70, 70)),
+                            MakeJunctionForTesting(m2::PointD(30, 70))}),  // feature 6
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMPH,
+                           {MakeJunctionForTesting(m2::PointD(30, 70)),
+                            MakeJunctionForTesting(m2::PointD(30, 30))}),  // feature 7
   };
   vector<uint32_t> const featureId_2 = { 4, 5, 6, 7 }; // featureIDs in the second connected component
 
@@ -232,13 +233,14 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad1)
              algorithm.CalculateRoute(graph, MakeJunctionForTesting(m2::PointD(2, 2)),
                                       MakeJunctionForTesting(m2::PointD(10, 2)), delegate, result),
              ());
-  TEST_EQUAL(result.path, vector<Junction>({MakeJunctionForTesting(m2::PointD(2,2)),
-                                            MakeJunctionForTesting(m2::PointD(2,3)),
-                                            MakeJunctionForTesting(m2::PointD(4,3)),
-                                            MakeJunctionForTesting(m2::PointD(6,3)),
-                                            MakeJunctionForTesting(m2::PointD(8,3)),
-                                            MakeJunctionForTesting(m2::PointD(10,3)),
-                                            MakeJunctionForTesting(m2::PointD(10,2))}), ());
+  TEST_EQUAL(
+      result.path,
+      vector<Junction>(
+          {MakeJunctionForTesting(m2::PointD(2, 2)), MakeJunctionForTesting(m2::PointD(2, 3)),
+           MakeJunctionForTesting(m2::PointD(4, 3)), MakeJunctionForTesting(m2::PointD(6, 3)),
+           MakeJunctionForTesting(m2::PointD(8, 3)), MakeJunctionForTesting(m2::PointD(10, 3)),
+           MakeJunctionForTesting(m2::PointD(10, 2))}),
+      ());
   TEST(my::AlmostEqualAbs(result.distance, 800451., 1.), ("Distance error:", result.distance));
 }
 
@@ -266,9 +268,10 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad2)
              algorithm.CalculateRoute(graph, MakeJunctionForTesting(m2::PointD(2, 2)),
                                       MakeJunctionForTesting(m2::PointD(10, 2)), delegate, result),
              ());
-  TEST_EQUAL(result.path, vector<Junction>({MakeJunctionForTesting(m2::PointD(2,2)),
-                                            MakeJunctionForTesting(m2::PointD(6,2)),
-                                            MakeJunctionForTesting(m2::PointD(10,2))}), ());
+  TEST_EQUAL(result.path, vector<Junction>({MakeJunctionForTesting(m2::PointD(2, 2)),
+                                            MakeJunctionForTesting(m2::PointD(6, 2)),
+                                            MakeJunctionForTesting(m2::PointD(10, 2))}),
+             ());
   TEST(my::AlmostEqualAbs(result.distance, 781458., 1.), ("Distance error:", result.distance));
 }
 
@@ -296,9 +299,10 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad3)
              algorithm.CalculateRoute(graph, MakeJunctionForTesting(m2::PointD(2, 2)),
                                       MakeJunctionForTesting(m2::PointD(10, 2)), delegate, result),
              ());
-  TEST_EQUAL(result.path, vector<Junction>({MakeJunctionForTesting(m2::PointD(2,2)),
-                                            MakeJunctionForTesting(m2::PointD(2,1)),
-                                            MakeJunctionForTesting(m2::PointD(10,1)),
-                                            MakeJunctionForTesting(m2::PointD(10,2))}), ());
+  TEST_EQUAL(result.path, vector<Junction>({MakeJunctionForTesting(m2::PointD(2, 2)),
+                                            MakeJunctionForTesting(m2::PointD(2, 1)),
+                                            MakeJunctionForTesting(m2::PointD(10, 1)),
+                                            MakeJunctionForTesting(m2::PointD(10, 2))}),
+             ());
   TEST(my::AlmostEqualAbs(result.distance, 814412., 1.), ("Distance error:", result.distance));
 }
diff --git a/routing/routing_tests/nearest_edge_finder_tests.cpp b/routing/routing_tests/nearest_edge_finder_tests.cpp
index 978f3531c2..913317febb 100644
--- a/routing/routing_tests/nearest_edge_finder_tests.cpp
+++ b/routing/routing_tests/nearest_edge_finder_tests.cpp
@@ -8,7 +8,7 @@ using namespace routing;
 using namespace routing_test;
 
 void TestNearestOnMock1(m2::PointD const & point, size_t const candidatesCount,
-                     vector<pair<Edge, Junction>> const & expected)
+                        vector<pair<Edge, Junction>> const & expected)
 {
   unique_ptr<RoadGraphMockSource> graph(new RoadGraphMockSource());
   InitRoadGraphMockSourceWithTest1(*graph);
@@ -29,36 +29,32 @@ void TestNearestOnMock1(m2::PointD const & point, size_t const candidatesCount,
 
 UNIT_TEST(StarterPosAtBorder_Mock1Graph)
 {
-  vector<pair<Edge, Junction>> const expected =
-  {
-    make_pair(Edge(MakeTestFeatureID(0), true /* forward */, 0,
-        MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(5, 0))),
-        MakeJunctionForTesting(m2::PointD(0, 0)))
-  };
+  vector<pair<Edge, Junction>> const expected = {make_pair(
+      Edge(MakeTestFeatureID(0), true /* forward */, 0, MakeJunctionForTesting(m2::PointD(0, 0)),
+           MakeJunctionForTesting(m2::PointD(5, 0))),
+      MakeJunctionForTesting(m2::PointD(0, 0)))};
   TestNearestOnMock1(m2::PointD(0, 0), 1, expected);
 }
 
 UNIT_TEST(MiddleEdgeTest_Mock1Graph)
 {
-  vector<pair<Edge, Junction>> const expected =
-  {
-    make_pair(Edge(MakeTestFeatureID(0), true /* forward */, 0,
-        MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(5, 0))),
-        MakeJunctionForTesting(m2::PointD(3, 0)))
-  };
+  vector<pair<Edge, Junction>> const expected = {make_pair(
+      Edge(MakeTestFeatureID(0), true /* forward */, 0, MakeJunctionForTesting(m2::PointD(0, 0)),
+           MakeJunctionForTesting(m2::PointD(5, 0))),
+      MakeJunctionForTesting(m2::PointD(3, 0)))};
   TestNearestOnMock1(m2::PointD(3, 3), 1, expected);
 }
 
 UNIT_TEST(MiddleSegmentTest_Mock1Graph)
 {
-  vector<pair<Edge, Junction>> const expected =
-  {
-    make_pair(Edge(MakeTestFeatureID(0), true /* forward */, 2,
-        MakeJunctionForTesting(m2::PointD(10, 0)), MakeJunctionForTesting(m2::PointD(15, 0))),
-        MakeJunctionForTesting(m2::PointD(12.5, 0))),
-    make_pair(Edge(MakeTestFeatureID(1), true /* forward */, 2,
-        MakeJunctionForTesting(m2::PointD(10, 0)), MakeJunctionForTesting(m2::PointD(10, 5))),
-        MakeJunctionForTesting(m2::PointD(10, 2.5)))
-  };
+  vector<pair<Edge, Junction>> const expected = {
+      make_pair(Edge(MakeTestFeatureID(0), true /* forward */, 2,
+                     MakeJunctionForTesting(m2::PointD(10, 0)),
+                     MakeJunctionForTesting(m2::PointD(15, 0))),
+                MakeJunctionForTesting(m2::PointD(12.5, 0))),
+      make_pair(Edge(MakeTestFeatureID(1), true /* forward */, 2,
+                     MakeJunctionForTesting(m2::PointD(10, 0)),
+                     MakeJunctionForTesting(m2::PointD(10, 5))),
+                MakeJunctionForTesting(m2::PointD(10, 2.5)))};
   TestNearestOnMock1(m2::PointD(12.5, 2.5), 2, expected);
 }
diff --git a/routing/routing_tests/road_graph_nearest_edges_test.cpp b/routing/routing_tests/road_graph_nearest_edges_test.cpp
index 757c7623ea..9346ab6441 100644
--- a/routing/routing_tests/road_graph_nearest_edges_test.cpp
+++ b/routing/routing_tests/road_graph_nearest_edges_test.cpp
@@ -55,30 +55,28 @@ UNIT_TEST(RoadGraph_NearestEdges)
   Junction const crossPos = MakeJunctionForTesting(m2::PointD(0, 0));
 
   // Expected outgoing edges.
-  IRoadGraph::TEdgeVector expectedOutgoing =
-  {
-    Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 1 /* segId */,
-      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(-1, 0))),
-    Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 2 /* segId */,
-      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(1, 0))),
-    Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 1 /* segId */,
-      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, -1))),
-    Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 2 /* segId */,
-      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, 1))),
+  IRoadGraph::TEdgeVector expectedOutgoing = {
+      Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 1 /* segId */,
+           MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(-1, 0))),
+      Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 2 /* segId */,
+           MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(1, 0))),
+      Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 1 /* segId */,
+           MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, -1))),
+      Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 2 /* segId */,
+           MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, 1))),
   };
   sort(expectedOutgoing.begin(), expectedOutgoing.end());
 
   // Expected ingoing edges.
-  IRoadGraph::TEdgeVector expectedIngoing =
-  {
-    Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 1 /* segId */,
-      MakeJunctionForTesting(m2::PointD(-1, 0)), MakeJunctionForTesting(m2::PointD(0, 0))),
-    Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 2 /* segId */,
-      MakeJunctionForTesting(m2::PointD(1, 0)), MakeJunctionForTesting(m2::PointD(0, 0))),
-    Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 1 /* segId */,
-      MakeJunctionForTesting(m2::PointD(0, -1)), MakeJunctionForTesting(m2::PointD(0, 0))),
-    Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 2 /* segId */,
-      MakeJunctionForTesting(m2::PointD(0, 1)), MakeJunctionForTesting(m2::PointD(0, 0))),
+  IRoadGraph::TEdgeVector expectedIngoing = {
+      Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 1 /* segId */,
+           MakeJunctionForTesting(m2::PointD(-1, 0)), MakeJunctionForTesting(m2::PointD(0, 0))),
+      Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 2 /* segId */,
+           MakeJunctionForTesting(m2::PointD(1, 0)), MakeJunctionForTesting(m2::PointD(0, 0))),
+      Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 1 /* segId */,
+           MakeJunctionForTesting(m2::PointD(0, -1)), MakeJunctionForTesting(m2::PointD(0, 0))),
+      Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 2 /* segId */,
+           MakeJunctionForTesting(m2::PointD(0, 1)), MakeJunctionForTesting(m2::PointD(0, 0))),
   };
   sort(expectedIngoing.begin(), expectedIngoing.end());