diff --git a/.clang-format b/.clang-format
index ea71ad6..ef6f54e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,7 +5,7 @@
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
+AlignEscapedNewlines: Right
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
@@ -14,13 +14,13 @@
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
+  AfterCaseLabel:  true
   AfterClass:      true
   AfterControlStatement: true
   AfterEnum:       true
@@ -29,15 +29,22 @@
   AfterObjCDeclaration: true
   AfterStruct:     true
   AfterUnion:      true
+  AfterExternBlock: true
   BeforeCatch:     true
   BeforeElse:      true
   IndentBraces:    false
+  SplitEmptyFunction:   false
+  SplitEmptyRecord:     false
+  SplitEmptyNamespace:  false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: true
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
@@ -51,17 +58,21 @@
 IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:           '^[<"](gtest|gmock)'
-    Priority:        5
+    Priority:        7
   - Regex:           '^"config.h"'
     Priority:        -1
-  - Regex:           '^".*\.hpp"'
+  - Regex:           '^".*\.h"'
     Priority:        1
-  - Regex:           '^<.*\.h>'
+  - Regex:           '^".*\.hpp"'
     Priority:        2
-  - Regex:           '^<.*'
+  - Regex:           '^<.*\.h>'
     Priority:        3
-  - Regex:           '.*'
+  - Regex:           '^<.*\.hpp>'
     Priority:        4
+  - Regex:           '^<.*'
+    Priority:        5
+  - Regex:           '.*'
+    Priority:        6
 IndentCaseLabels: true
 IndentWidth:     4
 IndentWrappedFunctionNames: true
@@ -83,8 +94,13 @@
 SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
diff --git a/include/ADCSensor.hpp b/include/ADCSensor.hpp
index f49b3db..d4ad601 100644
--- a/include/ADCSensor.hpp
+++ b/include/ADCSensor.hpp
@@ -4,9 +4,10 @@
 #include "sensor.hpp"
 
 #include <gpiod.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <memory>
 #include <optional>
-#include <sdbusplus/asio/object_server.hpp>
 #include <stdexcept>
 #include <string>
 #include <vector>
diff --git a/include/CPUSensor.hpp b/include/CPUSensor.hpp
index 8f9cb6e..0bcf3ed 100644
--- a/include/CPUSensor.hpp
+++ b/include/CPUSensor.hpp
@@ -5,11 +5,12 @@
 #include "sensor.hpp"
 
 #include <boost/container/flat_map.hpp>
+#include <gpiod.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <filesystem>
 #include <fstream>
-#include <gpiod.hpp>
 #include <memory>
-#include <sdbusplus/asio/object_server.hpp>
 #include <stdexcept>
 #include <string>
 #include <variant>
diff --git a/include/ChassisIntrusionSensor.hpp b/include/ChassisIntrusionSensor.hpp
index f65ef33..a54299e 100644
--- a/include/ChassisIntrusionSensor.hpp
+++ b/include/ChassisIntrusionSensor.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <gpiod.hpp>
-#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+
+#include <memory>
 #include <string>
 
 enum IntrusionSensorType
diff --git a/include/ExitAirTempSensor.hpp b/include/ExitAirTempSensor.hpp
index 33ecb04..e3c2ef5 100644
--- a/include/ExitAirTempSensor.hpp
+++ b/include/ExitAirTempSensor.hpp
@@ -2,10 +2,11 @@
 #include "sensor.hpp"
 
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/bus/match.hpp>
+
 #include <chrono>
 #include <limits>
 #include <memory>
-#include <sdbusplus/bus/match.hpp>
 #include <string>
 #include <vector>
 
@@ -47,8 +48,9 @@
     sdbusplus::asio::object_server& objServer;
 };
 
-struct ExitAirTempSensor : public Sensor,
-                           std::enable_shared_from_this<ExitAirTempSensor>
+struct ExitAirTempSensor :
+    public Sensor,
+    std::enable_shared_from_this<ExitAirTempSensor>
 {
 
     double powerFactorMin;
diff --git a/include/HwmonTempSensor.hpp b/include/HwmonTempSensor.hpp
index 5124260..7da2a4d 100644
--- a/include/HwmonTempSensor.hpp
+++ b/include/HwmonTempSensor.hpp
@@ -4,11 +4,13 @@
 #include "sensor.hpp"
 
 #include <sdbusplus/asio/object_server.hpp>
+
 #include <string>
 #include <vector>
 
-class HwmonTempSensor : public Sensor,
-                        public std::enable_shared_from_this<HwmonTempSensor>
+class HwmonTempSensor :
+    public Sensor,
+    public std::enable_shared_from_this<HwmonTempSensor>
 {
   public:
     HwmonTempSensor(const std::string& path, const std::string& objectType,
diff --git a/include/IpmbSensor.hpp b/include/IpmbSensor.hpp
index 2185b68..c5548fa 100644
--- a/include/IpmbSensor.hpp
+++ b/include/IpmbSensor.hpp
@@ -3,6 +3,7 @@
 
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/container/flat_map.hpp>
+
 #include <chrono>
 #include <limits>
 #include <memory>
diff --git a/include/MCUTempSensor.hpp b/include/MCUTempSensor.hpp
index eb12c9a..74ba083 100644
--- a/include/MCUTempSensor.hpp
+++ b/include/MCUTempSensor.hpp
@@ -3,6 +3,7 @@
 
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/container/flat_map.hpp>
+
 #include <chrono>
 #include <limits>
 #include <memory>
diff --git a/include/PSUEvent.hpp b/include/PSUEvent.hpp
index 50f6359..cc9a0e6 100644
--- a/include/PSUEvent.hpp
+++ b/include/PSUEvent.hpp
@@ -17,8 +17,9 @@
 #pragma once
 
 #include <boost/container/flat_map.hpp>
-#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
diff --git a/include/PSUSensor.hpp b/include/PSUSensor.hpp
index 811250d..b63e767 100644
--- a/include/PSUSensor.hpp
+++ b/include/PSUSensor.hpp
@@ -4,8 +4,9 @@
 #include "Thresholds.hpp"
 #include "sensor.hpp"
 
-#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+
+#include <memory>
 #include <string>
 
 class PSUSensor : public Sensor, public std::enable_shared_from_this<PSUSensor>
@@ -44,8 +45,7 @@
     PSUProperty(std::string name, double max, double min, unsigned int factor) :
         labelTypeName(name), maxReading(max), minReading(min),
         sensorScaleFactor(factor)
-    {
-    }
+    {}
     ~PSUProperty() = default;
 
     std::string labelTypeName;
diff --git a/include/PwmSensor.hpp b/include/PwmSensor.hpp
index f0dc7e6..22614e6 100644
--- a/include/PwmSensor.hpp
+++ b/include/PwmSensor.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+
+#include <memory>
 #include <string>
 
 class PwmSensor
diff --git a/include/TachSensor.hpp b/include/TachSensor.hpp
index 9ae04e1..0e3a837 100644
--- a/include/TachSensor.hpp
+++ b/include/TachSensor.hpp
@@ -7,9 +7,10 @@
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <gpiod.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <memory>
 #include <optional>
-#include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/include/Thresholds.hpp b/include/Thresholds.hpp
index 33c6f8f..fe27474 100644
--- a/include/Thresholds.hpp
+++ b/include/Thresholds.hpp
@@ -2,9 +2,10 @@
 #include "Utils.hpp"
 
 #include <boost/asio/io_service.hpp>
+#include <nlohmann/json.hpp>
+
 #include <list>
 #include <memory>
-#include <nlohmann/json.hpp>
 #include <string>
 #include <utility>
 #include <vector>
@@ -28,8 +29,7 @@
               bool write = true) :
         level(lev),
         direction(dir), value(val), writeable(write)
-    {
-    }
+    {}
     Level level;
     Direction direction;
     double value;
@@ -59,8 +59,7 @@
 
     ThresholdTimer(boost::asio::io_service& ioService, Sensor* sensor) :
         io(ioService), sensor(sensor)
-    {
-    }
+    {}
 
     void stopTimer(const Threshold& threshold)
     {
diff --git a/include/Utils.hpp b/include/Utils.hpp
index 565656a..224842c 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -3,14 +3,15 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/message/types.hpp>
+
 #include <filesystem>
 #include <functional>
 #include <iostream>
 #include <memory>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/message/types.hpp>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -155,16 +156,15 @@
     std::shared_ptr<sdbusplus::asio::dbus_interface> association,
     const std::string& path);
 
-struct GetSensorConfiguration
-    : std::enable_shared_from_this<GetSensorConfiguration>
+struct GetSensorConfiguration :
+    std::enable_shared_from_this<GetSensorConfiguration>
 {
     GetSensorConfiguration(
         std::shared_ptr<sdbusplus::asio::connection> connection,
         std::function<void(ManagedObjectType& resp)>&& callbackFunc) :
         dbusConnection(connection),
         callback(std::move(callbackFunc))
-    {
-    }
+    {}
     void getConfiguration(const std::vector<std::string>& interfaces)
     {
         std::shared_ptr<GetSensorConfiguration> self = shared_from_this();
diff --git a/include/sensor.hpp b/include/sensor.hpp
index a8fb952..4e98089 100644
--- a/include/sensor.hpp
+++ b/include/sensor.hpp
@@ -2,9 +2,10 @@
 
 #include "Thresholds.hpp"
 
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <limits>
 #include <memory>
-#include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <vector>
 
@@ -22,8 +23,7 @@
         maxValue(max), minValue(min), thresholds(std::move(thresholdData)),
         hysteresisTrigger((max - min) * 0.01),
         hysteresisPublish((max - min) * 0.0001)
-    {
-    }
+    {}
     virtual ~Sensor() = default;
     virtual void checkThresholds(void) = 0;
     std::string name;
diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp
index d22afd8..bfe17ac 100644
--- a/src/ADCSensor.cpp
+++ b/src/ADCSensor.cpp
@@ -21,6 +21,9 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <cmath>
 #include <filesystem>
 #include <fstream>
@@ -28,8 +31,6 @@
 #include <limits>
 #include <memory>
 #include <optional>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <vector>
 
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index df35722..cc8e7cd 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -22,15 +22,16 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
 #include <filesystem>
 #include <fstream>
 #include <functional>
 #include <memory>
 #include <optional>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <string>
 #include <variant>
 #include <vector>
diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp
index 241b14f..ea869c9 100644
--- a/src/CPUSensor.cpp
+++ b/src/CPUSensor.cpp
@@ -23,12 +23,13 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <iostream>
 #include <istream>
 #include <limits>
 #include <memory>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
 #include <stdexcept>
 #include <string>
 #include <vector>
diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp
index 15a5a37..6b04fd1 100644
--- a/src/CPUSensorMain.cpp
+++ b/src/CPUSensorMain.cpp
@@ -20,21 +20,22 @@
 
 #include <fcntl.h>
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/process/child.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
 #include <filesystem>
 #include <fstream>
 #include <functional>
 #include <memory>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -70,8 +71,7 @@
               const std::string& name, const State& state) :
         bus(bus),
         addr(addr), name(name), state(state)
-    {
-    }
+    {}
     int bus;
     int addr;
     std::string name;
diff --git a/src/ChassisIntrusionSensor.cpp b/src/ChassisIntrusionSensor.cpp
index 15ed888..8293bab 100644
--- a/src/ChassisIntrusionSensor.cpp
+++ b/src/ChassisIntrusionSensor.cpp
@@ -23,14 +23,16 @@
 
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <memory>
-#include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <thread>
 
-extern "C" {
+extern "C"
+{
 #include <i2c/smbus.h>
 #include <linux/i2c-dev.h>
 }
@@ -363,8 +365,7 @@
     mType(IntrusionSensorType::gpio), mValue("unknown"), mOldValue("unknown"),
     mBusId(-1), mSlaveAddr(-1), mPollTimer(io), mGpioInverted(false),
     mGpioFd(io)
-{
-}
+{}
 
 ChassisIntrusionSensor::~ChassisIntrusionSensor()
 {
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index 9ba311b..70c7bae 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -21,10 +21,14 @@
 
 #include <math.h>
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
 #include <chrono>
 #include <cmath>
 #include <functional>
@@ -32,9 +36,6 @@
 #include <limits>
 #include <memory>
 #include <numeric>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <stdexcept>
 #include <utility>
 #include <variant>
diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index 37a4e63..9f78fc7 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -19,21 +19,22 @@
 #include "Utils.hpp"
 #include "VariantVisitors.hpp"
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/lexical_cast.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
 #include <filesystem>
 #include <fstream>
 #include <functional>
 #include <memory>
 #include <optional>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <string>
 #include <utility>
 #include <variant>
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index ab3544d..94f23c0 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -17,19 +17,20 @@
 #include "HwmonTempSensor.hpp"
 #include "Utils.hpp"
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
 #include <filesystem>
 #include <fstream>
 #include <functional>
 #include <memory>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/src/HwmonTempSensor.cpp b/src/HwmonTempSensor.cpp
index 9f9448a..71ff4ed 100644
--- a/src/HwmonTempSensor.cpp
+++ b/src/HwmonTempSensor.cpp
@@ -21,12 +21,13 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <iostream>
 #include <istream>
 #include <limits>
 #include <memory>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <vector>
 
diff --git a/src/IntrusionSensorMain.cpp b/src/IntrusionSensorMain.cpp
index f6cf9aa..f3d95fb 100644
--- a/src/IntrusionSensorMain.cpp
+++ b/src/IntrusionSensorMain.cpp
@@ -19,16 +19,9 @@
 
 #include <systemd/sd-journal.h>
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
 #include <boost/container/flat_map.hpp>
-#include <chrono>
-#include <ctime>
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/asio/sd_event.hpp>
@@ -37,6 +30,14 @@
 #include <sdbusplus/exception.hpp>
 #include <sdbusplus/server.hpp>
 #include <sdbusplus/timer.hpp>
+
+#include <array>
+#include <chrono>
+#include <ctime>
+#include <fstream>
+#include <functional>
+#include <iostream>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/src/IpmbSensor.cpp b/src/IpmbSensor.cpp
index 9f591ac..87ad632 100644
--- a/src/IpmbSensor.cpp
+++ b/src/IpmbSensor.cpp
@@ -25,15 +25,16 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
 #include <chrono>
 #include <functional>
 #include <iostream>
 #include <limits>
 #include <memory>
 #include <numeric>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <string>
 #include <tuple>
 #include <variant>
diff --git a/src/MCUTempSensor.cpp b/src/MCUTempSensor.cpp
index 06376b6..a413214 100644
--- a/src/MCUTempSensor.cpp
+++ b/src/MCUTempSensor.cpp
@@ -24,19 +24,21 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
 #include <chrono>
 #include <functional>
 #include <iostream>
 #include <limits>
 #include <memory>
 #include <numeric>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <string>
 #include <vector>
 
-extern "C" {
+extern "C"
+{
 #include <i2c/smbus.h>
 #include <linux/i2c-dev.h>
 }
diff --git a/src/NVMeSensor.cpp b/src/NVMeSensor.cpp
index e993833..8cdf744 100644
--- a/src/NVMeSensor.cpp
+++ b/src/NVMeSensor.cpp
@@ -23,6 +23,7 @@
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/asio/ip/tcp.hpp>
+
 #include <iostream>
 
 static constexpr double maxReading = 127;
@@ -288,8 +289,7 @@
 void rxMessage(uint8_t eid, void*, void* msg, size_t len)
 {
     struct nvme_mi_msg_response_header header
-    {
-    };
+    {};
 
     int inFd = mctp_smbus_get_in_fd(nvmeMCTP::smbus);
     int rootBus = nvmeMCTP::getRootBus(inFd);
diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index 1858ea9..8a1f4bc 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -17,6 +17,7 @@
 #include "NVMeSensor.hpp"
 
 #include <boost/asio/deadline_timer.hpp>
+
 #include <regex>
 
 static constexpr const char* sensorType =
diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index c8107bd..94125fa 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -19,10 +19,11 @@
 #include <systemd/sd-journal.h>
 
 #include <boost/container/flat_map.hpp>
-#include <iostream>
-#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+
+#include <iostream>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/src/PSUSensor.cpp b/src/PSUSensor.cpp
index 28eec4f..4d6bc1d 100644
--- a/src/PSUSensor.cpp
+++ b/src/PSUSensor.cpp
@@ -21,12 +21,13 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <iostream>
 #include <istream>
 #include <limits>
 #include <memory>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <vector>
 
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 1b363e1..a011e49 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -18,20 +18,21 @@
 #include "PSUSensor.hpp"
 #include "Utils.hpp"
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
 #include <cmath>
 #include <filesystem>
 #include <fstream>
 #include <functional>
 #include <iostream>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <string>
 #include <utility>
 #include <variant>
diff --git a/src/PwmSensor.cpp b/src/PwmSensor.cpp
index eee29ef..3e5c8a1 100644
--- a/src/PwmSensor.cpp
+++ b/src/PwmSensor.cpp
@@ -17,9 +17,10 @@
 
 #include "Utils.hpp"
 
+#include <sdbusplus/asio/object_server.hpp>
+
 #include <fstream>
 #include <iostream>
-#include <sdbusplus/asio/object_server.hpp>
 #include <stdexcept>
 #include <string>
 
diff --git a/src/TachSensor.cpp b/src/TachSensor.cpp
index bea79d8..c45fcb0 100644
--- a/src/TachSensor.cpp
+++ b/src/TachSensor.cpp
@@ -23,15 +23,16 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <fstream>
 #include <gpiod.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
+#include <fstream>
 #include <iostream>
 #include <istream>
 #include <limits>
 #include <memory>
 #include <optional>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index dd6b7ca..9e0066f 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -3,10 +3,11 @@
 #include "VariantVisitors.hpp"
 #include "sensor.hpp"
 
-#include <array>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/lexical_cast.hpp>
+
+#include <array>
 #include <cmath>
 #include <fstream>
 #include <iostream>
diff --git a/src/Utils.cpp b/src/Utils.cpp
index ca5a294..6b9ddf9 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -18,13 +18,14 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
 #include <filesystem>
 #include <fstream>
 #include <memory>
 #include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/tests/test_HwmonTempSensor.cpp b/tests/test_HwmonTempSensor.cpp
index f8efcc4..0368064 100644
--- a/tests/test_HwmonTempSensor.cpp
+++ b/tests/test_HwmonTempSensor.cpp
@@ -1,8 +1,9 @@
 #include <HwmonTempSensor.hpp>
 #include <dbus/connection.hpp>
-#include <fstream>
 #include <nlohmann/json.hpp>
 
+#include <fstream>
+
 #include "gtest/gtest.h"
 
 TEST(HwmonTempSensor, TestTMP75)
diff --git a/tests/test_TachSensor.cpp b/tests/test_TachSensor.cpp
index 3e95aba..b28de93 100644
--- a/tests/test_TachSensor.cpp
+++ b/tests/test_TachSensor.cpp
@@ -1,9 +1,10 @@
 #include <TachSensor.hpp>
 #include <Thresholds.hpp>
 #include <dbus/connection.hpp>
-#include <fstream>
 #include <nlohmann/json.hpp>
 
+#include <fstream>
+
 #include "gtest/gtest.h"
 
 TEST(TachSensor, TestTachSensor)