diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp
index 60c3410286..d44876115b 100644
--- a/generator/routing_generator.cpp
+++ b/generator/routing_generator.cpp
@@ -108,7 +108,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
           if (outStart == outEnd)
             continue;
           m2::PointD intersection = m2::PointD::Zero();
-          for (auto segment : data.m_segments)
+          for (auto const & segment : data.m_segments)
             if (border.FindIntersection({segment.lon1, segment.lat1}, {segment.lon2, segment.lat2}, intersection))
               break;
           if (intersection == m2::PointD::Zero())
diff --git a/geometry/region2d.hpp b/geometry/region2d.hpp
index ecad889b79..efc7355a04 100644
--- a/geometry/region2d.hpp
+++ b/geometry/region2d.hpp
@@ -139,13 +139,13 @@ namespace m2
       double v = ((x12 - x11) * (y21 - y11) + (y12 - y11) * (x11 - x21)) / ((y12 - y11) * (x22 - x21) - (x12 - x11) * (y22 - y21));
       PointT p(x21 + (x22 - x21) * v, y21 + (y22 - y21) * v);
 
-      if (!(((p.x >= x11) && (p.x <= x12)) || ((p.x <= x11)&&(p.x >= x12))))
+      if (!(((p.x >= x11) && (p.x <= x12)) || ((p.x <= x11) && (p.x >= x12))))
         return false;
-      if (!(((p.x >= x21) && (p.x <= x22)) || ((p.x <= x21)&&(p.x >= x22))))
+      if (!(((p.x >= x21) && (p.x <= x22)) || ((p.x <= x21) && (p.x >= x22))))
         return false;
-      if (!(((p.y >= y11) && (p.y <= y12)) || ((p.y <= y11)&&(p.y >= y12))))
+      if (!(((p.y >= y11) && (p.y <= y12)) || ((p.y <= y11) && (p.y >= y12))))
         return false;
-      if (!(((p.y >= y21) && (p.y <= y22)) || ((p.y <= y21)&&(p.y >= y22))))
+      if (!(((p.y >= y21) && (p.y <= y22)) || ((p.y <= y21) && (p.y >= y22))))
         return false;
 
       pt = p;
@@ -220,17 +220,17 @@ namespace m2
       return Contains(pt, typename TraitsT::EqualType());
     }
 
-    //Finds point of intersection with border
+    /// Finds point of intersection with the section.
     bool FindIntersection(PointT const & point1, PointT const & point2, PointT & result) const
     {
-      size_t const numPoints = m_points.size();
-      PointT prev = m_points[numPoints - 1];
-      for (size_t i = 0; i < numPoints; ++i)
+      if (m_points.empty())
+        return false;
+      PointT const * prev = &m_points.back();
+      for (PointT const & curr : m_points)
       {
-        PointT const curr = m_points[i];
-        if (IsIntersect(point1, point2, prev, curr, result))
+        if (IsIntersect(point1, point2, *prev, curr, result))
           return true;
-        prev = curr;
+        prev = &curr;
       }
       return false;
     }
diff --git a/routing/cross_routing_context.cpp b/routing/cross_routing_context.cpp
index 45ed02aed2..01224b318a 100644
--- a/routing/cross_routing_context.cpp
+++ b/routing/cross_routing_context.cpp
@@ -7,41 +7,43 @@ namespace routing
 
 uint32_t const g_coordBits = POINT_COORD_BITS;
 
-void OutgoingCrossNode::Save(Writer &w)
+void OutgoingCrossNode::Save(Writer &w) const
 {
-  w.Write(&m_nodeId, sizeof(m_nodeId));
-  uint64_t const point = PointToInt64(m_point, g_coordBits);
-  w.Write(&point, sizeof(point));
-  w.Write(&m_outgoingIndex, sizeof(m_outgoingIndex));
+  uint64_t point = PointToInt64(m_point, g_coordBits);
+  char buff[sizeof(m_nodeId) + sizeof(point) + sizeof(m_outgoingIndex)];
+  *reinterpret_cast<decltype(m_nodeId) *>(&buff[0]) = m_nodeId;
+  *reinterpret_cast<decltype(point) *>(&(buff[sizeof(m_nodeId)])) = point;
+  *reinterpret_cast<decltype(m_outgoingIndex) *>(&(buff[sizeof(m_nodeId) + sizeof(point)])) = m_outgoingIndex;
+  w.Write(buff, sizeof(buff));
+
 }
 
 size_t OutgoingCrossNode::Load(const Reader &r, size_t pos)
 {
-  r.Read(pos, &m_nodeId, sizeof(m_nodeId));
-  pos += sizeof(m_nodeId);
-  uint64_t point;
-  r.Read(pos, &point, sizeof(point));
-  m_point = Int64ToPoint(point, g_coordBits);
-  pos += sizeof(point);
-  r.Read(pos, &m_outgoingIndex, sizeof(m_outgoingIndex));
-  return pos + sizeof(m_outgoingIndex);
+  char buff[sizeof(m_nodeId) + sizeof(uint64_t) + sizeof(m_outgoingIndex)];
+  r.Read(pos, buff, sizeof(buff));
+  m_nodeId = *reinterpret_cast<decltype(m_nodeId) *>(&buff[0]);
+  m_point = Int64ToPoint(*reinterpret_cast<uint64_t *>(&(buff[sizeof(m_nodeId)])), g_coordBits);
+  m_outgoingIndex = *reinterpret_cast<decltype(m_outgoingIndex) *>(&(buff[sizeof(m_nodeId) + sizeof(uint64_t)]));
+  return pos + sizeof(buff);
 }
 
-void IngoingCrossNode::Save(Writer &w)
+void IngoingCrossNode::Save(Writer &w) const
 {
-  w.Write(&m_nodeId, sizeof(m_nodeId));
-  uint64_t const point = PointToInt64(m_point, g_coordBits);
-  w.Write(&point, sizeof(point));
+  uint64_t point = PointToInt64(m_point, g_coordBits);
+  char buff[sizeof(m_nodeId) + sizeof(point)];
+  *reinterpret_cast<decltype(m_nodeId) *>(&buff[0]) = m_nodeId;
+  *reinterpret_cast<decltype(point) *>(&(buff[sizeof(m_nodeId)])) = point;
+  w.Write(buff, sizeof(buff));
 }
 
 size_t IngoingCrossNode::Load(const Reader &r, size_t pos)
 {
-  r.Read(pos, &m_nodeId, sizeof(m_nodeId));
-  pos += sizeof(m_nodeId);
-  uint64_t point;
-  r.Read(pos, &point, sizeof(point));
-  m_point = Int64ToPoint(point, g_coordBits);
-  return pos + sizeof(point);
+  char buff[sizeof(m_nodeId) + sizeof(uint64_t)];
+  r.Read(pos, buff, sizeof(buff));
+  m_nodeId = *reinterpret_cast<decltype(m_nodeId) *>(&buff[0]);
+  m_point = Int64ToPoint(*reinterpret_cast<uint64_t *>(&(buff[sizeof(m_nodeId)])), g_coordBits);
+  return pos + sizeof(buff);
 }
 
 size_t CrossRoutingContextReader::GetIndexInAdjMatrix(IngoingEdgeIteratorT ingoing, OutgoingEdgeIteratorT outgoing) const
diff --git a/routing/cross_routing_context.hpp b/routing/cross_routing_context.hpp
index 4e9f111b31..0982e6c5ba 100644
--- a/routing/cross_routing_context.hpp
+++ b/routing/cross_routing_context.hpp
@@ -10,8 +10,8 @@
 namespace routing
 {
 using WritedEdgeWeightT = uint32_t;
-static const WritedEdgeWeightT INVALID_CONTEXT_EDGE_WEIGHT = std::numeric_limits<WritedEdgeWeightT>::max();
-static const WritedEdgeWeightT INVALID_CONTEXT_EDGE_NODE_ID = std::numeric_limits<uint32_t>::max();
+static WritedEdgeWeightT const INVALID_CONTEXT_EDGE_WEIGHT = std::numeric_limits<WritedEdgeWeightT>::max();
+static WritedEdgeWeightT const INVALID_CONTEXT_EDGE_NODE_ID = std::numeric_limits<uint32_t>::max();
 
 struct IngoingCrossNode
 {
@@ -21,7 +21,7 @@ struct IngoingCrossNode
   IngoingCrossNode() : m_nodeId(INVALID_CONTEXT_EDGE_NODE_ID), m_point(m2::PointD::Zero()) {}
   IngoingCrossNode(uint32_t nodeId, m2::PointD const & point) : m_nodeId(nodeId), m_point(point) {}
 
-  void Save(Writer & w);
+  void Save(Writer & w) const;
 
   size_t Load(Reader const & r, size_t pos);
 };
@@ -37,7 +37,7 @@ struct OutgoingCrossNode
                                                                                      m_point(point),
                                                                                      m_outgoingIndex(static_cast<unsigned char>(index)){}
 
-  void Save(Writer & w);
+  void Save(Writer & w) const;
 
   size_t Load(Reader const & r, size_t pos);
 };