diff --git a/generator/statistics.cpp b/generator/statistics.cpp
index 79e00e10d4..effa978a71 100644
--- a/generator/statistics.cpp
+++ b/generator/statistics.cpp
@@ -96,7 +96,7 @@ namespace stats
         }, FeatureType::BEST_GEOMETRY);
       }
 
-      bool hasName = f.GetNames().CountLangs() != 0;
+      auto const hasName = f.GetNames().CountLangs() != 0;
 
       m_info.m_byGeomType[f.GetGeomType()].Add(allSize, len, area, hasName);
 
diff --git a/generator/statistics.hpp b/generator/statistics.hpp
index 3a3bd1aa55..19b5abd41e 100644
--- a/generator/statistics.hpp
+++ b/generator/statistics.hpp
@@ -10,9 +10,6 @@ namespace stats
 {
   struct GeneralInfo
   {
-    uint64_t m_count, m_size, m_names;
-    double m_length, m_area;
-
     GeneralInfo() : m_count(0), m_size(0), m_names(0), m_length(0), m_area(0) {}
 
     void Add(uint64_t szBytes, double len = 0, double area = 0, bool hasName = false)
@@ -27,6 +24,12 @@ namespace stats
           ++m_names;
       }
     }
+
+    uint64_t m_count;
+    uint64_t m_size;
+    uint64_t m_names;
+    double m_length;
+    double m_area;
   };
 
   template <class T, int Tag>