diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18f989b35..a532f3ff5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
   Changes from 5.3.0
     - Profiles
       - includes library guidance.lua that offers preliminary configuration on guidance.
+      - added left_hand_driving flag in global profile properties
     - Guidance
       - Handle Access tags for lanes, only considering valid lanes in lane-guidance (think car | car | bike | car)
     - API:
diff --git a/include/engine/guidance/post_processing.hpp b/include/engine/guidance/post_processing.hpp
index f1b7bb1ca..21420bb62 100644
--- a/include/engine/guidance/post_processing.hpp
+++ b/include/engine/guidance/post_processing.hpp
@@ -1,10 +1,10 @@
 #ifndef ENGINE_GUIDANCE_POST_PROCESSING_HPP
 #define ENGINE_GUIDANCE_POST_PROCESSING_HPP
 
+#include "engine/datafacade/datafacade_base.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "engine/phantom_node.hpp"
-#include "engine/datafacade/datafacade_base.hpp"
 
 #include <vector>
 
diff --git a/include/extractor/guidance/roundabout_handler.hpp b/include/extractor/guidance/roundabout_handler.hpp
index af4234602..fffbf7197 100644
--- a/include/extractor/guidance/roundabout_handler.hpp
+++ b/include/extractor/guidance/roundabout_handler.hpp
@@ -5,8 +5,8 @@
 #include "extractor/guidance/intersection.hpp"
 #include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/roundabout_type.hpp"
-#include "extractor/query_node.hpp"
 #include "extractor/profile_properties.hpp"
+#include "extractor/query_node.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
diff --git a/src/extractor/guidance/roundabout_handler.cpp b/src/extractor/guidance/roundabout_handler.cpp
index 42fa254ea..b2c1ddf1f 100644
--- a/src/extractor/guidance/roundabout_handler.cpp
+++ b/src/extractor/guidance/roundabout_handler.cpp
@@ -28,8 +28,7 @@ RoundaboutHandler::RoundaboutHandler(const util::NodeBasedDynamicGraph &node_bas
                                      const SuffixTable &street_name_suffix_table,
                                      const ProfileProperties &profile_properties)
     : IntersectionHandler(node_based_graph, node_info_list, name_table, street_name_suffix_table),
-      compressed_edge_container(compressed_edge_container),
-      profile_properties(profile_properties)
+      compressed_edge_container(compressed_edge_container), profile_properties(profile_properties)
 {
 }
 
@@ -69,8 +68,8 @@ detail::RoundaboutFlags RoundaboutHandler::getRoundaboutFlags(
 
     const bool lhs = profile_properties.left_hand_driving;
     const int step = lhs ? -1 : 1;
-    for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0;
-         cnt < intersection.size(); ++cnt, idx += step)
+    for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; cnt < intersection.size();
+         ++cnt, idx += step)
     {
         const auto &road = intersection[idx];
         const auto &edge_data = node_based_graph.GetEdgeData(road.turn.eid);
@@ -108,8 +107,8 @@ void RoundaboutHandler::invalidateExitAgainstDirection(const NodeID from_nid,
     bool past_roundabout_angle = false;
     const bool lhs = profile_properties.left_hand_driving;
     const int step = lhs ? -1 : 1;
-    for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0;
-         cnt < intersection.size(); ++cnt, idx += step)
+    for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; cnt < intersection.size();
+         ++cnt, idx += step)
     {
         auto &road = intersection[idx];
         const auto &edge_data = node_based_graph.GetEdgeData(road.turn.eid);
@@ -373,7 +372,8 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
         // Shoule hopefully have only a single exit and continue
         // at least for cars. How about bikes?
         for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0;
-             cnt < intersection.size(); ++cnt, idx += step)
+             cnt < intersection.size();
+             ++cnt, idx += step)
         {
             auto &road = intersection[idx];
             auto &turn = road.turn;
@@ -410,7 +410,8 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
     else
     {
         for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0;
-             cnt < intersection.size(); ++cnt, idx += step)
+             cnt < intersection.size();
+             ++cnt, idx += step)
         {
             auto &road = intersection[idx];
             if (!road.entry_allowed)