diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index f607564c58..e00912d843 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -26,7 +26,8 @@
 
 using namespace std;
 
-template <class TSource, class InfoT> void Read(TSource & src, InfoT & i)
+template <typename Source, typename Info>
+void Read(Source & src, Info & i)
 {
   rw::Read(src, i.m_tag);
 
@@ -34,7 +35,8 @@ template <class TSource, class InfoT> void Read(TSource & src, InfoT & i)
   i.m_size = ReadVarUint<uint64_t>(src);
 }
 
-template <class TSink, class InfoT> void Write(TSink & sink, InfoT const & i)
+template <typename Sink, typename Info>
+void Write(Sink & sink, Info const & i)
 {
   rw::Write(sink, i.m_tag);
 
@@ -53,12 +55,12 @@ string DebugPrint(FilesContainerBase::Info const & info)
 // FilesContainerBase
 /////////////////////////////////////////////////////////////////////////////
 
-template <class ReaderT>
-void FilesContainerBase::ReadInfo(ReaderT & reader)
+template <typename Reader>
+void FilesContainerBase::ReadInfo(Reader & reader)
 {
   uint64_t offset = ReadPrimitiveFromPos<uint64_t>(reader, 0);
 
-  ReaderSource<ReaderT> src(reader);
+  ReaderSource<Reader> src(reader);
   src.Skip(offset);
 
   rw::Read(src, m_info);
diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index 5ace2700d9..84799567bc 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -30,6 +30,12 @@ public:
     return GetInfo(tag) != 0;
   }
 
+  template <typename ToDo>
+  void ForEachTag(ToDo && toDo) const
+  {
+    std::for_each(m_info.begin(), m_info.end(), std::forward<ToDo>(toDo));
+  }
+
 protected:
   struct Info
   {
@@ -41,10 +47,6 @@ protected:
     Info(Tag const & tag, uint64_t offset) : m_tag(tag), m_offset(offset) {}
   };
 
-  friend std::string DebugPrint(Info const & info);
-
-  Info const * GetInfo(Tag const & tag) const;
-
   struct LessInfo
   {
     bool operator() (Info const & t1, Info const & t2) const
@@ -97,18 +99,15 @@ protected:
     Tag const & m_tag;
   };
 
+  friend std::string DebugPrint(Info const & info);
+
+  Info const * GetInfo(Tag const & tag) const;
+
+  template <typename Reader>
+  void ReadInfo(Reader & reader);
+
   using InfoContainer = std::vector<Info>;
   InfoContainer m_info;
-
-  template <typename ReaderT>
-  void ReadInfo(ReaderT & reader);
-
-public:
-  template <typename ToDo>
-  void ForEachTag(ToDo && toDo) const
-  {
-    std::for_each(m_info.begin(), m_info.end(), std::forward<ToDo>(toDo));
-  }
 };
 
 class FilesContainerR : public FilesContainerBase
@@ -143,8 +142,6 @@ namespace detail
 {
 class MappedFile
 {
-  DISALLOW_COPY(MappedFile);
-
 public:
   MappedFile() = default;
   ~MappedFile() { Close(); }
@@ -154,23 +151,16 @@ public:
 
   class Handle
   {
-    DISALLOW_COPY(Handle);
-
-    void Reset();
-
   public:
-    Handle()
-      : m_base(0), m_origBase(0), m_size(0), m_origSize(0)
-    {
-    }
+    Handle() = default;
+
     Handle(char const * base, char const * alignBase, uint64_t size, uint64_t origSize)
       : m_base(base), m_origBase(alignBase), m_size(size), m_origSize(origSize)
     {
     }
-    Handle(Handle && h) : Handle()
-    {
-      Assign(std::move(h));
-    }
+
+    Handle(Handle && h) { Assign(std::move(h)); }
+
     ~Handle();
 
     void Assign(Handle && h);
@@ -195,10 +185,14 @@ public:
     }
 
   private:
-    char const * m_base;
-    char const * m_origBase;
-    uint64_t m_size;
-    uint64_t m_origSize;
+    void Reset();
+
+    char const * m_base = nullptr;
+    char const * m_origBase = nullptr;
+    uint64_t m_size = 0;
+    uint64_t m_origSize = 0;
+
+    DISALLOW_COPY(Handle);
   };
 
   Handle Map(uint64_t offset, uint64_t size, std::string const & tag) const;
@@ -210,6 +204,8 @@ private:
 #else
   int m_fd = -1;
 #endif
+
+  DISALLOW_COPY(MappedFile);
 };
 } // namespace detail
 
diff --git a/coding/file_reader.cpp b/coding/file_reader.cpp
index 6678f13aa3..6a7d0231a4 100644
--- a/coding/file_reader.cpp
+++ b/coding/file_reader.cpp
@@ -19,11 +19,9 @@ namespace
 {
 class FileDataWithCachedSize : public my::FileData
 {
-  using base_t = my::FileData;
-
 public:
   explicit FileDataWithCachedSize(string const & fileName)
-    : base_t(fileName, FileData::OP_READ), m_Size(FileData::Size())
+    : my::FileData(fileName, FileData::OP_READ), m_Size(FileData::Size())
   {
   }
 
@@ -86,7 +84,7 @@ FileReader::FileReader(std::string const & fileName)
 }
 
 FileReader::FileReader(string const & fileName, uint32_t logPageSize, uint32_t logPageCount)
-  : BaseType(fileName)
+  : ModelReader(fileName)
   , m_logPageSize(logPageSize)
   , m_logPageCount(logPageCount)
   , m_fileData(new FileReaderData(fileName, logPageSize, logPageCount))
@@ -97,7 +95,7 @@ FileReader::FileReader(string const & fileName, uint32_t logPageSize, uint32_t l
 
 FileReader::FileReader(FileReader const & reader, uint64_t offset, uint64_t size,
                        uint32_t logPageSize, uint32_t logPageCount)
-  : BaseType(reader.GetName())
+  : ModelReader(reader.GetName())
   , m_logPageSize(logPageSize)
   , m_logPageCount(logPageCount)
   , m_fileData(reader.m_fileData)
diff --git a/coding/file_reader.hpp b/coding/file_reader.hpp
index 707fa49545..db7f449a4e 100644
--- a/coding/file_reader.hpp
+++ b/coding/file_reader.hpp
@@ -34,8 +34,6 @@ protected:
   void SetOffsetAndSize(uint64_t offset, uint64_t size);
 
 private:
-  using BaseType = ModelReader;
-
   class FileReaderData;
 
   FileReader(FileReader const & reader, uint64_t offset, uint64_t size, uint32_t logPageSize,
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index 57d53a2cd6..f1d1680d3e 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -49,6 +49,7 @@ using namespace feature;
 using namespace platform;
 using namespace routing;
 using namespace std;
+using namespace std::placeholders;
 
 namespace
 {
@@ -110,8 +111,7 @@ public:
 
   void ProcessAllFeatures(string const & filename)
   {
-    feature::ForEachFromDat(filename, bind(&Processor::ProcessFeature, this, std::placeholders::_1,
-                                           std::placeholders::_2));
+    feature::ForEachFromDat(filename, bind(&Processor::ProcessFeature, this, _1, _2));
   }
 
   void BuildGraph(IndexGraph & graph) const