diff --git a/routing/base/followed_polyline.cpp b/routing/base/followed_polyline.cpp
index b241446b93..f435594788 100644
--- a/routing/base/followed_polyline.cpp
+++ b/routing/base/followed_polyline.cpp
@@ -149,7 +149,6 @@ FollowedPolyline::UpdatedProjectionInfo FollowedPolyline::UpdateMatchedProjectio
   ASSERT(m_current.IsValid(), ());
   ASSERT_LESS(m_current.m_ind, m_poly.GetSize() - 1, ());
 
-  m2::PointD const & currPos = posRect.Center();
   auto res = GetBestMatchedProjection(posRect);
 
   if (res.iter.IsValid())
@@ -267,6 +266,6 @@ FollowedPolyline::UpdatedProjection FollowedPolyline::GetClosestMatchedProjectio
         minDistUnmatched = dp;
     }
   }
-  return UpdatedProjection{nearestIter, minDistUnmatched < minDist};
+  return UpdatedProjection{nearestIter /* Iter */, minDistUnmatched < minDist /* closerToUnmatched */};
 }
 }  //  namespace routing
diff --git a/routing/base/followed_polyline.hpp b/routing/base/followed_polyline.hpp
index bec2ddae39..9687ae680f 100644
--- a/routing/base/followed_polyline.hpp
+++ b/routing/base/followed_polyline.hpp
@@ -138,8 +138,8 @@ public:
     return res;
   }
 
-  UpdatedProjection GetClosestMatchedProjectionInInterval(m2::RectD const & posRect,
-                                                              size_t startIdx, size_t endIdx) const;
+UpdatedProjection GetClosestMatchedProjectionInInterval(m2::RectD const & posRect,
+                                                            size_t startIdx, size_t endIdx) const;
 
 private:
   /// \returns iterator to the best projection of center of |posRect| to the |m_poly|.
diff --git a/routing/route.cpp b/routing/route.cpp
index 3c123e1c9d..d5b4bb3d41 100644
--- a/routing/route.cpp
+++ b/routing/route.cpp
@@ -240,13 +240,13 @@ void Route::GetCurrentDirectionPoint(m2::PointD & pt) const
 
 void Route::SetFakeSegmentsOnPolyline()
 {
-  vector<size_t> fakeSegmentIndexes{};
-  auto const & routeSegments = GetRouteSegments();
-  for (size_t i = 0; i < routeSegments.size(); ++i)
+  vector<size_t> fakeSegmentIndexes;
+  for (size_t i = 0; i < m_routeSegments.size(); ++i)
   {
-    if (!routeSegments[i].GetSegment().IsRealSegment())
+    if (!m_routeSegments[i].GetSegment().IsRealSegment())
       fakeSegmentIndexes.push_back(i);
   }
+
   m_poly.SetUnmatchedSegmentIndexes(move(fakeSegmentIndexes));
 }