diff --git a/include/util/debug.hpp b/include/util/debug.hpp
index d3b0f7782..5b32c104f 100644
--- a/include/util/debug.hpp
+++ b/include/util/debug.hpp
@@ -23,8 +23,6 @@ namespace util
 namespace guidance
 {
 
-
-
 inline void print(const engine::guidance::RouteStep &step)
 {
     std::cout << static_cast<int>(step.maneuver.instruction.type) << " "
diff --git a/src/engine/plugins/tile.cpp b/src/engine/plugins/tile.cpp
index 1d0542b64..41a850e6e 100644
--- a/src/engine/plugins/tile.cpp
+++ b/src/engine/plugins/tile.cpp
@@ -1,7 +1,7 @@
 #include "extractor/guidance/turn_instruction.hpp"
 
-#include "engine/plugins/tile.hpp"
 #include "engine/plugins/plugin_base.hpp"
+#include "engine/plugins/tile.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/string_view.hpp"
diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp
index d891415b5..31d231052 100644
--- a/src/extractor/scripting_environment_lua.cpp
+++ b/src/extractor/scripting_environment_lua.cpp
@@ -395,8 +395,8 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
         "get_relations",
         [&getTypedRefBySol](ExtractionRelationContainer &cont, const sol::object &obj)
             -> const ExtractionRelationContainer::RelationIDList & {
-            return cont.GetRelations(getTypedRefBySol(obj));
-        },
+                return cont.GetRelations(getTypedRefBySol(obj));
+            },
         "relation",
         [](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id)
             -> const ExtractionRelation & { return cont.GetRelationData(rel_id); });
diff --git a/unit_tests/engine/guidance_assembly.cpp b/unit_tests/engine/guidance_assembly.cpp
index 5873b6f9c..60a481594 100644
--- a/unit_tests/engine/guidance_assembly.cpp
+++ b/unit_tests/engine/guidance_assembly.cpp
@@ -1,3 +1,5 @@
+#include "extractor/travel_mode.hpp"
+
 #include "engine/guidance/assemble_geometry.hpp"
 #include "engine/guidance/assemble_leg.hpp"
 #include "engine/guidance/assemble_overview.hpp"
@@ -12,6 +14,7 @@ BOOST_AUTO_TEST_SUITE(guidance_assembly)
 
 BOOST_AUTO_TEST_CASE(trim_short_segments)
 {
+    using namespace osrm::extractor;
     using namespace osrm::extractor::guidance;
     using namespace osrm::engine::guidance;
     using namespace osrm::engine;
@@ -46,7 +49,7 @@ BOOST_AUTO_TEST_CASE(trim_short_segments)
                                      0.2,
                                      1.9076601161280742,
                                      0.2,
-                                     extractor::TRAVEL_MODE_DRIVING,
+                                     TRAVEL_MODE_DRIVING,
                                      {{FloatLongitude{-73.981492}, FloatLatitude{40.768258}},
                                       329,
                                       348,
@@ -67,7 +70,7 @@ BOOST_AUTO_TEST_CASE(trim_short_segments)
                                      0,
                                      0,
                                      0,
-                                     extractor::TRAVEL_MODE_DRIVING,
+                                     TRAVEL_MODE_DRIVING,
                                      {{FloatLongitude{-73.981495}, FloatLatitude{40.768275}},
                                       0,
                                       0,