diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index 482382d411..af0ee65ea4 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -348,9 +348,6 @@ void AddElementToCache(TCache & cache, TElement const & em)
   {
     case TElement::EntityType::Node:
     {
-      // Could do something with em.id, em.lon, em.lat here
-      // lon and lat are ints in 1E+7 * degree units
-      // convert to mercator
       auto const pt = MercatorBounds::FromLatLon(em.lat, em.lon);
       cache.AddNode(em.id, pt.y, pt.x);
       break;
@@ -372,8 +369,6 @@ void AddElementToCache(TCache & cache, TElement const & em)
       RelationElement relation;
       for (auto const & member : em.Members())
       {
-        // Could do something with member ref (way or node or rel id depends on type), type and
-        // role
         if (member.type == TElement::EntityType::Node)
           relation.nodes.emplace_back(make_pair(member.ref, string(member.role)));
         else if (member.type == TElement::EntityType::Way)
diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp
index 9db9f85cdd..9a12daacb0 100644
--- a/generator/osm_source.hpp
+++ b/generator/osm_source.hpp
@@ -3,9 +3,9 @@
 #include "generator/generate_info.hpp"
 #include "generator/xml_element.hpp"
 
+#include "std/function.hpp"
 #include "std/iostream.hpp"
 #include "std/unique_ptr.hpp"
-#include "std/function.hpp"
 
 class SourceReader
 {
diff --git a/generator/xml_element.hpp b/generator/xml_element.hpp
index 3dd38745c2..41a5878436 100644
--- a/generator/xml_element.hpp
+++ b/generator/xml_element.hpp
@@ -3,14 +3,13 @@
 #include "base/math.hpp"
 #include "base/string_utils.hpp"
 
+#include "std/exception.hpp"
+#include "std/function.hpp"
+#include "std/iomanip.hpp"
+#include "std/iostream.hpp"
+#include "std/map.hpp"
 #include "std/string.hpp"
 #include "std/vector.hpp"
-#include "std/map.hpp"
-
-#include "std/iostream.hpp"
-#include "std/function.hpp"
-#include "std/exception.hpp"
-#include "std/iomanip.hpp"
 
 struct XMLElement
 {