diff --git a/routing/directions_engine.hpp b/routing/directions_engine.hpp
index 63abeccd0f..0131d2b0ee 100644
--- a/routing/directions_engine.hpp
+++ b/routing/directions_engine.hpp
@@ -18,8 +18,8 @@ class IDirectionsEngine
 public:
   virtual ~IDirectionsEngine() = default;
 
-  // @TODO(bykoianko) After fields |m_turns|, |m_times|, |m_streets| and |m_traffic|
-  // will be removed from class Route the method Generate() should fill
+  // @TODO(bykoianko) When fields |m_turns|, |m_times|, |m_streets| and |m_traffic|
+  // are removed from class Route the method Generate() should fill
   // vector<RouteSegment> instead of corresponding arguments.
   virtual void Generate(RoadGraphBase const & graph, vector<Junction> const & path,
                         my::Cancellable const & cancellable, Route::TTurns & turns,
diff --git a/routing/route.hpp b/routing/route.hpp
index 3959218ee8..3b884ca05a 100644
--- a/routing/route.hpp
+++ b/routing/route.hpp
@@ -55,7 +55,7 @@ public:
   Segment const & GetSegment() const { return m_segment; }
   turns::TurnItem const & GetTurn() const { return m_turn; }
   Junction const & GetJunction() const { return m_junction; }
-  std::string const GetStreet() const { return m_street; }
+  std::string const & GetStreet() const { return m_street; }
   double GetDistFromBeginningMeters() const { return m_distFromBeginningMeters; }
   double GetDistFromBeginningMerc() const { return m_distFromBeginningMerc; }
   double GetTimeFromBeginningS() const { return m_timeFromBeginningS; }
@@ -66,7 +66,7 @@ private:
   /// Turn (maneuver) information for the turn next to the |m_segment| if any.
   /// If not |m_turn::m_turn| is equal to TurnDirection::NoTurn.
   turns::TurnItem m_turn;
-  Junction m_junction; ///< The front point of segment.
+  Junction m_junction; ///< The front junction of segment.
   /// Street name of |m_segment| if any. Otherwise |m_street| is empty.
   std::string m_street;
   /// Distance from the route beginning to the farthest end of |m_segment| in meters.
diff --git a/routing/routing_helpers.cpp b/routing/routing_helpers.cpp
index 14083934f0..2ab098bb41 100644
--- a/routing/routing_helpers.cpp
+++ b/routing/routing_helpers.cpp
@@ -38,7 +38,6 @@ void FillSegmentInfo(vector<Segment> const & segments, vector<Junction> const &
     CHECK_LESS(streets.back().first, junctions.size(), ());
   CHECK_LESS(times.back().first, junctions.size(), ());
 
-
   routeSegment.clear();
   if (segments.empty())
     return;
diff --git a/routing/routing_tests/routing_helpers_tests.cpp b/routing/routing_tests/routing_helpers_tests.cpp
index 808188ba74..ba471effcb 100644
--- a/routing/routing_tests/routing_helpers_tests.cpp
+++ b/routing/routing_tests/routing_helpers_tests.cpp
@@ -63,4 +63,4 @@ UNIT_TEST(FillSegmentInfoTest)
   TEST_EQUAL(segmentInfo[1].GetStreet(), string("second"), ());
   TEST_EQUAL(segmentInfo[1].GetSegment(), segments[1], ());
 }
-}  // namespace routing_test
\ No newline at end of file
+}  // namespace routing_test