diff --git a/routing/index_graph_loader.cpp b/routing/index_graph_loader.cpp
index 80bcfb6ca2..83d466f45f 100644
--- a/routing/index_graph_loader.cpp
+++ b/routing/index_graph_loader.cpp
@@ -84,7 +84,7 @@ IndexGraphLoaderImpl::IndexGraphLoaderImpl(
 
 IndexGraph & IndexGraphLoaderImpl::GetIndexGraph(NumMwmId numMwmId)
 {
-  auto res = m_graphs.insert({numMwmId, GraphPtrT{}});
+  auto res = m_graphs.try_emplace(numMwmId, GraphPtrT{});
   if (res.second)
     res.first->second = CreateIndexGraph(numMwmId);
   return *(res.first->second);
@@ -92,7 +92,7 @@ IndexGraph & IndexGraphLoaderImpl::GetIndexGraph(NumMwmId numMwmId)
 
 IndexGraphLoaderImpl::CamerasMapT const & IndexGraphLoaderImpl::ReceiveSpeedCamsFromMwm(NumMwmId numMwmId)
 {
-  auto res = m_cachedCameras.insert({numMwmId, {}});
+  auto res = m_cachedCameras.try_emplace(numMwmId, CamerasMapT{});
   if (res.second)
   {
     auto const & file = m_numMwmIds->GetFile(numMwmId);
diff --git a/routing/index_graph_starter_joints.hpp b/routing/index_graph_starter_joints.hpp
index de04f319d7..26b017ae47 100644
--- a/routing/index_graph_starter_joints.hpp
+++ b/routing/index_graph_starter_joints.hpp
@@ -293,7 +293,7 @@ RouteWeight IndexGraphStarterJoints<Graph>::HeuristicCostEstimate(JointSegment c
   Segment fromSegment;
   if (from.IsFake() || IsInvisible(from))
   {
-    auto it = m_reconstructedFakeJoints.find(from);
+    auto const it = m_reconstructedFakeJoints.find(from);
     CHECK(it != m_reconstructedFakeJoints.end(), ("No such fake joint:", from));
     fromSegment = it->second.m_path.back();
   }
@@ -313,7 +313,7 @@ IndexGraphStarterJoints<Graph>::GetPoint(JointSegment const & jointSegment, bool
   Segment segment;
   if (jointSegment.IsFake())
   {
-    auto it = m_fakeJointSegments.find(jointSegment);
+    auto const it = m_fakeJointSegments.find(jointSegment);
     CHECK(it != m_fakeJointSegments.end(), ("No such fake joint:", jointSegment));
     segment = it->second.GetSegment(start);
   }
diff --git a/routing/leaps_graph.cpp b/routing/leaps_graph.cpp
index 6f02bb187e..9b0931e161 100644
--- a/routing/leaps_graph.cpp
+++ b/routing/leaps_graph.cpp
@@ -39,8 +39,7 @@ RouteWeight LeapsGraph::HeuristicCostEstimate(Segment const & from, Segment cons
   return m_starter.HeuristicCostEstimate(from, toPoint);
 }
 
-void LeapsGraph::GetEdgesList(Segment const & segment, bool isOutgoing,
-                              EdgeListT & edges)
+void LeapsGraph::GetEdgesList(Segment const & segment, bool isOutgoing, EdgeListT & edges)
 {
   edges.clear();
 
@@ -48,14 +47,14 @@ void LeapsGraph::GetEdgesList(Segment const & segment, bool isOutgoing,
   {
     CHECK(isOutgoing, ("Only forward wave of A* should get edges from start. Backward wave should "
                        "stop when first time visit the |m_startSegment|."));
-    return GetEdgesListFromStart(segment, edges);
+    return GetEdgesListFromStart(edges);
   }
 
   if (segment == m_finishSegment)
   {
     CHECK(!isOutgoing, ("Only backward wave of A* should get edges to finish. Forward wave should "
                         "stop when first time visit the |m_finishSegment|."));
-    return GetEdgesListToFinish(segment, edges);
+    return GetEdgesListToFinish(edges);
   }
 
   if (!m_starter.IsRoutingOptionsGood(segment))
@@ -81,7 +80,7 @@ void LeapsGraph::GetEdgesList(Segment const & segment, bool isOutgoing,
     crossMwmGraph.GetIngoingEdgeList(segment, edges);
 }
 
-void LeapsGraph::GetEdgesListFromStart(Segment const & /*segment*/, EdgeListT & edges)
+void LeapsGraph::GetEdgesListFromStart(EdgeListT & edges) const
 {
   for (auto const mwmId : m_starter.GetStartMwms())
   {
@@ -97,7 +96,7 @@ void LeapsGraph::GetEdgesListFromStart(Segment const & /*segment*/, EdgeListT &
   }
 }
 
-void LeapsGraph::GetEdgesListToFinish(Segment const & /*segment*/, EdgeListT & edges)
+void LeapsGraph::GetEdgesListToFinish(EdgeListT & edges) const
 {
   for (auto const mwmId : m_starter.GetFinishMwms())
   {
@@ -118,16 +117,6 @@ ms::LatLon const & LeapsGraph::GetPoint(Segment const & segment, bool front) con
   return m_starter.GetPoint(segment, front);
 }
 
-Segment const & LeapsGraph::GetStartSegment() const
-{
-  return m_startSegment;
-}
-
-Segment const & LeapsGraph::GetFinishSegment() const
-{
-  return m_finishSegment;
-}
-
 RouteWeight LeapsGraph::GetAStarWeightEpsilon()
 {
   return m_starter.GetAStarWeightEpsilon();
diff --git a/routing/leaps_graph.hpp b/routing/leaps_graph.hpp
index c20f83a412..2067266732 100644
--- a/routing/leaps_graph.hpp
+++ b/routing/leaps_graph.hpp
@@ -29,16 +29,17 @@ public:
   RouteWeight GetAStarWeightEpsilon() override;
   // @}
 
-  Segment const & GetStartSegment() const;
-  Segment const & GetFinishSegment() const;
+  Segment const & GetStartSegment() const { return m_startSegment; }
+  Segment const & GetFinishSegment() const { return m_finishSegment; }
   ms::LatLon const & GetPoint(Segment const & segment, bool front) const;
 
 private:
   void GetEdgesList(Segment const & segment, bool isOutgoing, EdgeListT & edges);
 
-  void GetEdgesListFromStart(Segment const & segment, EdgeListT & edges);
-  void GetEdgesListToFinish(Segment const & segment, EdgeListT & edges);
+  void GetEdgesListFromStart(EdgeListT & edges) const;
+  void GetEdgesListToFinish(EdgeListT & edges) const;
 
+private:
   ms::LatLon m_startPoint;
   ms::LatLon m_finishPoint;
 
diff --git a/routing/segment.cpp b/routing/segment.cpp
index 013fa82a22..19d93a9569 100644
--- a/routing/segment.cpp
+++ b/routing/segment.cpp
@@ -45,7 +45,6 @@ bool Segment::IsInverse(Segment const & seg) const
 bool Segment::IsFakeCreated() const
 {
   return m_featureId == FakeFeatureIds::kIndexGraphStarterId;
-  //return m_mwmId == kFakeNumMwmId;
 }
 
 bool Segment::IsRealSegment() const
diff --git a/routing/segment.hpp b/routing/segment.hpp
index 0562f87179..24670c8f8d 100644
--- a/routing/segment.hpp
+++ b/routing/segment.hpp
@@ -50,7 +50,7 @@ public:
   bool IsInverse(Segment const & seg) const;
   void Inverse() { m_forward = !m_forward; }
 
-  /// @todo Logically, this functions should be equal, but keep existing logic,
+  /// @todo Logically, these functions should be equal, but keep existing logic,
   /// and investigate possible enhancements in future.
   /// @{
   bool IsFakeCreated() const;