diff --git a/routing/route.cpp b/routing/route.cpp
index 3a32260363..06c082f1d0 100644
--- a/routing/route.cpp
+++ b/routing/route.cpp
@@ -476,7 +476,7 @@ void Route::GetSubrouteInfo(size_t segmentIdx, std::vector<SegmentInfo> & segmen
   CHECK(IsValid(), ());
   segments.clear();
 
-  vector<m2::PointD> const & points = m_poly.GetPolyline().GetPoints();
+  auto const & points = m_poly.GetPolyline().GetPoints();
   size_t const polySz = m_poly.GetPolyline().GetSize();
 
   CHECK(!m_turns.empty(), ());
@@ -547,15 +547,15 @@ void Route::SetSubrouteUid(size_t segmentIdx, SubrouteUid subrouteUid)
   m_subrouteUid = subrouteUid;
 }
 
-Junction Route::GetJunction(size_t pointInx) const
+Junction Route::GetJunction(size_t pointIdx) const
 {
   CHECK(IsValid(), ());
   if (!m_altitudes.empty())
     CHECK_EQUAL(m_altitudes.size(), m_poly.GetPolyline().GetSize(), ());
 
-  vector<m2::PointD> const & points = m_poly.GetPolyline().GetPoints();
-  return Junction(points[pointInx],
-                  m_altitudes.empty() ? feature::kInvalidAltitude : m_altitudes[pointInx]);
+  auto const & points = m_poly.GetPolyline().GetPoints();
+  return Junction(points[pointIdx],
+                  m_altitudes.empty() ? feature::kInvalidAltitude : m_altitudes[pointIdx]);
 }
 
 string DebugPrint(Route const & r)
diff --git a/routing/route.hpp b/routing/route.hpp
index 4c84c1cead..82745051d9 100644
--- a/routing/route.hpp
+++ b/routing/route.hpp
@@ -75,15 +75,16 @@ public:
     traffic::SpeedGroup const m_traffic = traffic::SpeedGroup::Unknown;
   };
 
-  struct SubrouteAttrs
+  class SubrouteAttrs final
   {
+  public:
     SubrouteAttrs(Junction const & start, Junction const & finish)
       : m_start(start), m_finish(finish)
     {
     }
 
-    Junction GetStart() const { return m_start; }
-    Junction GetFinish() const { return m_finish; }
+    Junction const & GetStart() const { return m_start; }
+    Junction const & GetFinish() const { return m_finish; }
 
   private:
     Junction m_start;
@@ -243,7 +244,7 @@ private:
   TStreets::const_iterator GetCurrentStreetNameIterAfter(FollowedPolyline::Iter iter) const;
   void AppendTraffic(Route const & route);
 
-  Junction GetJunction(size_t pointInx) const;
+  Junction GetJunction(size_t pointIdx) const;
 
   string m_router;
   RoutingSettings m_routingSettings;