diff --git a/include/mapnik/geometry/is_empty.hpp b/include/mapnik/geometry/is_empty.hpp
index e39a5b9f7..71c7ad70b 100644
--- a/include/mapnik/geometry/is_empty.hpp
+++ b/include/mapnik/geometry/is_empty.hpp
@@ -45,7 +45,8 @@ struct geometry_is_empty
     {
         for (auto const& ring : poly)
         {
-            if (!ring.empty()) return false;
+            if (!ring.empty())
+                return false;
         }
         return true;
     }
@@ -56,7 +57,8 @@ struct geometry_is_empty
     {
         for (auto const& line : mline)
         {
-            if (!line.empty()) return false;
+            if (!line.empty())
+                return false;
         }
         return true;
     }
@@ -65,7 +67,8 @@ struct geometry_is_empty
     {
         for (auto const& poly : mpoly)
         {
-            if (!operator()(poly)) return false;
+            if (!operator()(poly))
+                return false;
         }
         return true;
     }
diff --git a/include/mapnik/json/create_geometry.hpp b/include/mapnik/json/create_geometry.hpp
index 707f5afa6..de9cab58d 100644
--- a/include/mapnik/json/create_geometry.hpp
+++ b/include/mapnik/json/create_geometry.hpp
@@ -64,10 +64,11 @@ struct create_linestring
     {
         mapnik::geometry::line_string<double> line;
         std::size_t size = points.size();
-        //if (size < 2)
+        // if (size < 2)
         //{
-        //    throw std::runtime_error("RFC 7946: For type \"LineString\", the \"coordinates\" member is an array of two or more positions.");
-        //}
+        //     throw std::runtime_error("RFC 7946: For type \"LineString\", the \"coordinates\" member is an array of
+        //     two or more positions.");
+        // }
         line.reserve(size);
         for (auto&& pt : points)
         {
@@ -114,7 +115,7 @@ struct create_polygon
 
     void operator()(ring const& points) const
     {
-        //POLYGON EMPTY
+        // POLYGON EMPTY
         geom_ = std::move(mapnik::geometry::polygon<double>{});
     }
 
@@ -182,7 +183,7 @@ struct create_multilinestring
 
     void operator()(ring const& points) const
     {
-        //MULTILINESTRING EMPTY
+        // MULTILINESTRING EMPTY
         geom_ = std::move(mapnik::geometry::multi_line_string<double>{});
     }
 
@@ -231,7 +232,7 @@ struct create_multipolygon
 
     void operator()(rings const& rngs) const
     {
-        //MULTIPOLYGON
+        // MULTIPOLYGON
         mapnik::geometry::multi_polygon<double> multi_poly;
         mapnik::geometry::polygon<double> poly;
         std::size_t num_rings = rngs.size();
@@ -245,7 +246,7 @@ struct create_multipolygon
 
     void operator()(ring const& points) const
     {
-        //MULTIPOLYGON EMPTY
+        // MULTIPOLYGON EMPTY
         geom_ = std::move(mapnik::geometry::multi_polygon<double>{});
     }
 
diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp
index 7c35e7f1b..a8812c7d4 100644
--- a/test/unit/datasource/geojson.cpp
+++ b/test/unit/datasource/geojson.cpp
@@ -145,8 +145,8 @@ TEST_CASE("geojson")
                 {
                     std::cerr << json << std::endl;
                 }
-                //REQUIRE(mapnik::geometry::is_empty(geom));
-                // round trip
+                // REQUIRE(mapnik::geometry::is_empty(geom));
+                //  round trip
                 std::string json_out;
                 CHECK(mapnik::util::to_geojson(json_out, geom));
                 json.erase(std::remove_if(std::begin(json),
diff --git a/test/unit/geometry/is_empty.cpp b/test/unit/geometry/is_empty.cpp
index 63caef803..2307ae66d 100644
--- a/test/unit/geometry/is_empty.cpp
+++ b/test/unit/geometry/is_empty.cpp
@@ -20,7 +20,6 @@
  *
  *****************************************************************************/
 
-
 #include "catch.hpp"
 
 #include <mapnik/geometry/is_empty.hpp>