diff --git a/drape/debug_rect_renderer.cpp b/drape/debug_rect_renderer.cpp
index 9b52182d49..e79dbabe8c 100644
--- a/drape/debug_rect_renderer.cpp
+++ b/drape/debug_rect_renderer.cpp
@@ -115,4 +115,3 @@ void DebugRectRenderer::DrawRect(ScreenBase const & screen, m2::RectF const & re
 }
 
 } // namespace dp
-
diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index 9e5fa737dc..715ffb26aa 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -15,7 +15,7 @@ namespace
 class HandleComparator
 {
 public:
-  bool operator()(OverlayTree::THandle const & l, OverlayTree::THandle const & r)
+  bool operator()(OverlayTree::THandle const & l, OverlayTree::THandle const & r) const
   {
     int const priorityLeft = l.first->GetPriority();
     int const priorityRight = r.first->GetPriority();
@@ -29,7 +29,7 @@ public:
   }
 };
 
-}
+} // namespace
 
 OverlayTree::OverlayTree()
   : m_frameCounter(-1)
@@ -78,7 +78,7 @@ void OverlayTree::Add(ref_ptr<OverlayHandle> handle, bool isTransparent)
     return;
   }
 
-  m_handles.push_back(make_pair(handle, isTransparent));
+  m_handles.emplace_back(make_pair(handle, isTransparent));
 }
 
 void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent)
@@ -112,13 +112,13 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent
   for (OverlayContainerT::const_iterator it = elements.begin(); it != elements.end(); ++it)
     Erase(*it);
 
-  BaseT::Add(detail::OverlayInfo(handle, isTransparent), pixelRect);
+  TBase::Add(detail::OverlayInfo(handle, isTransparent), pixelRect);
 }
 
 void OverlayTree::EndOverlayPlacing()
 {
   HandleComparator comparator;
-  sort(m_handles.begin(), m_handles.end(), bind(&HandleComparator::operator(), &comparator, _1, _2));
+  sort(m_handles.begin(), m_handles.end(), comparator);
   for (auto const & handle : m_handles)
     InsertHandle(handle.first, handle.second);
   m_handles.clear();
diff --git a/drape/overlay_tree.hpp b/drape/overlay_tree.hpp
index ada959607c..9e617dff3a 100644
--- a/drape/overlay_tree.hpp
+++ b/drape/overlay_tree.hpp
@@ -46,7 +46,7 @@ struct OverlayTraits
 
 class OverlayTree : public m4::Tree<detail::OverlayInfo, detail::OverlayTraits>
 {
-  using BaseT = m4::Tree<detail::OverlayInfo, detail::OverlayTraits>;
+  using TBase = m4::Tree<detail::OverlayInfo, detail::OverlayTraits>;
 
 public:
   OverlayTree();
@@ -63,14 +63,13 @@ public:
   void Select(m2::RectD const & rect, TSelectResult & result) const;
 
   using THandle = pair<ref_ptr<OverlayHandle>, bool>;
-  using THandles = vector<THandle>;
 
 private:
   ScreenBase const & GetModelView() const { return m_traits.m_modelView; }
   void InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent);
 
   int m_frameCounter;
-  THandles m_handles;
+  vector<THandle> m_handles;
 };
 
 } // namespace dp
diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp
index 9238c21b71..93888c093f 100644
--- a/drape_frontend/path_text_shape.cpp
+++ b/drape_frontend/path_text_shape.cpp
@@ -21,8 +21,6 @@
 #include "std/algorithm.hpp"
 #include "std/vector.hpp"
 
-#include "drape/glfunctions.hpp"
-
 using m2::Spline;
 
 namespace