diff --git a/Descriptors/BaseDescriptor.h b/Descriptors/BaseDescriptor.h
index 122230053..22835ad2b 100644
--- a/Descriptors/BaseDescriptor.h
+++ b/Descriptors/BaseDescriptor.h
@@ -44,11 +44,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 
 struct DescriptorConfig {
-    DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {}
+    DescriptorConfig() :
+        instructions(true),
+        geometry(true),
+        encode_geometry(true),
+        zoom_level(18)
+    { }
     bool instructions;
     bool geometry;
-    bool encodeGeometry;
-    unsigned short z;
+    bool encode_geometry;
+    unsigned short zoom_level;
 };
 
 template<class DataFacadeT>
@@ -57,7 +62,12 @@ public:
     BaseDescriptor() { }
     //Maybe someone can explain the pure virtual destructor thing to me (dennis)
     virtual ~BaseDescriptor() { }
-    virtual void Run(http::Reply & reply, const RawRouteData &rawRoute, PhantomNodes &phantomNodes, const DataFacadeT * facade) = 0;
+    virtual void Run(
+        http::Reply & reply,
+        const RawRouteData &rawRoute,
+        PhantomNodes &phantomNodes,
+        const DataFacadeT * facade
+    ) = 0;
     virtual void SetConfig(const DescriptorConfig & config) = 0;
 };
 
diff --git a/Descriptors/GPXDescriptor.h b/Descriptors/GPXDescriptor.h
index 286af617b..84d01295b 100644
--- a/Descriptors/GPXDescriptor.h
+++ b/Descriptors/GPXDescriptor.h
@@ -40,7 +40,7 @@ private:
 
     std::string tmp;
 public:
-    void SetConfig(const DescriptorConfig& c) { config = c; }
+    void SetConfig(const DescriptorConfig & c) { config = c; }
 
     //TODO: reorder parameters
     void Run(
diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index 6ddbdbd0f..4e863c3ec 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -107,10 +107,13 @@ public:
                     "\"status_message\": \"Cannot find route between points\",";
         }
 
-        description_factory.Run(facade, config.z);
+        description_factory.Run(facade, config.zoom_level);
         reply.content += "\"route_geometry\": ";
         if(config.geometry) {
-            description_factory.AppendEncodedPolylineString(reply.content, config.encodeGeometry);
+            description_factory.AppendEncodedPolylineString(
+                reply.content,
+                config.encode_geometry
+            );
         } else {
             reply.content += "[]";
         }
@@ -173,13 +176,16 @@ public:
             }
             alternateDescriptionFactory.SetEndSegment(phantom_nodes.targetPhantom);
         }
-        alternateDescriptionFactory.Run(facade, config.z);
+        alternateDescriptionFactory.Run(facade, config.zoom_level);
 
         //give an array of alternative routes
         reply.content += "\"alternative_geometries\": [";
         if(config.geometry && INT_MAX != raw_route_information.lengthOfAlternativePath) {
             //Generate the linestrings for each alternative
-            alternateDescriptionFactory.AppendEncodedPolylineString(reply.content, config.encodeGeometry);
+            alternateDescriptionFactory.AppendEncodedPolylineString(
+                reply.content,
+                config.encode_geometry
+            );
         }
         reply.content += "],";
         reply.content += "\"alternative_instructions\":[";