diff --git a/common/dBusAsyncUtils.hpp b/common/dBusAsyncUtils.hpp
index 391573e..628b8d8 100644
--- a/common/dBusAsyncUtils.hpp
+++ b/common/dBusAsyncUtils.hpp
@@ -142,7 +142,8 @@
             {
                 lg2::error(
                     "error while coGetAllDbusProperty.GetAll for service={SERVICE}, path={OBJECT_PATH}. {ERROR_MESSAGE} ",
-                    "SERVICE", service, "OBJECT_PATH", objectPath, "ERROR_MESSAGE", ec.message());
+                    "SERVICE", service, "OBJECT_PATH", objectPath,
+                    "ERROR_MESSAGE", ec.message());
             }
             else
             {
@@ -171,7 +172,8 @@
     coGetAllDbusProperty(const std::string& service,
                          const std::string& objectPath,
                          const std::string& interface = "") :
-        service(service), objectPath(objectPath), interface(interface), ret{}
+        service(service),
+        objectPath(objectPath), interface(interface), ret{}
     {}
 };
 
diff --git a/common/timer.hpp b/common/timer.hpp
index 01e1f63..63ba4f7 100644
--- a/common/timer.hpp
+++ b/common/timer.hpp
@@ -114,7 +114,8 @@
                 rc = NSM_SW_ERROR; // Handle errors from adding the timer
                 return false;
             }
-            // sd_event_source_set_priority(eventSource, SD_EVENT_PRIORITY_NORMAL);
+            // sd_event_source_set_priority(eventSource,
+            // SD_EVENT_PRIORITY_NORMAL);
         }
         return true;
     }
diff --git a/nsmd/nsmEvent/nsmRediscoveryEvent.hpp b/nsmd/nsmEvent/nsmRediscoveryEvent.hpp
index cc99547..28d9ce3 100644
--- a/nsmd/nsmEvent/nsmRediscoveryEvent.hpp
+++ b/nsmd/nsmEvent/nsmRediscoveryEvent.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "nsmEventInfo.hpp"
 #include "deviceManager.hpp"
+#include "nsmEventInfo.hpp"
 #include "sensorManager.hpp"
 
 namespace nsm