diff --git a/bmc/firmware-handler/firmware_handlers_builder.hpp b/bmc/firmware-handler/firmware_handlers_builder.hpp
index 6cfb649..40be15c 100644
--- a/bmc/firmware-handler/firmware_handlers_builder.hpp
+++ b/bmc/firmware-handler/firmware_handlers_builder.hpp
@@ -11,7 +11,7 @@
 class FirmwareHandlersBuilder : public HandlersBuilderIfc<ActionPack>
 {
   public:
-    std::vector<HandlerConfig<ActionPack>>
-        buildHandlerFromJson(const nlohmann::json& data) override;
+    std::vector<HandlerConfig<ActionPack>> buildHandlerFromJson(
+        const nlohmann::json& data) override;
 };
 } // namespace ipmi_flash
diff --git a/bmc/firmware-handler/lpc_aspeed.hpp b/bmc/firmware-handler/lpc_aspeed.hpp
index 1a547c9..22ce66e 100644
--- a/bmc/firmware-handler/lpc_aspeed.hpp
+++ b/bmc/firmware-handler/lpc_aspeed.hpp
@@ -15,8 +15,8 @@
 class LpcMapperAspeed : public HardwareMapperInterface
 {
   public:
-    static std::unique_ptr<HardwareMapperInterface>
-        createAspeedMapper(std::uint32_t regionAddress, std::size_t regionSize);
+    static std::unique_ptr<HardwareMapperInterface> createAspeedMapper(
+        std::uint32_t regionAddress, std::size_t regionSize);
 
     /* NOTE: This object is created and then never destroyed (unless ipmid
      * stops/crashes, etc)
diff --git a/bmc/firmware-handler/lpc_nuvoton.cpp b/bmc/firmware-handler/lpc_nuvoton.cpp
index dcf9eaa..b0d2a4e 100644
--- a/bmc/firmware-handler/lpc_nuvoton.cpp
+++ b/bmc/firmware-handler/lpc_nuvoton.cpp
@@ -97,8 +97,8 @@
  *   - WindowOffset = 4 and WindowSize = len - 4 if (addr & 0x7) == 0
  *   - WindowSize = 0 means that the region cannot be mapped otherwise
  */
-WindowMapResult
-    LpcMapperNuvoton::mapWindow(std::uint32_t address, std::uint32_t length)
+WindowMapResult LpcMapperNuvoton::mapWindow(std::uint32_t address,
+                                            std::uint32_t length)
 {
     WindowMapResult result = {};
 
diff --git a/bmc/firmware-handler/test/crc_mock.hpp b/bmc/firmware-handler/test/crc_mock.hpp
index c33188d..5dbe1ee 100644
--- a/bmc/firmware-handler/test/crc_mock.hpp
+++ b/bmc/firmware-handler/test/crc_mock.hpp
@@ -10,8 +10,8 @@
   public:
     virtual ~CrcInterface() = default;
 
-    virtual std::uint16_t
-        generateCrc(const std::vector<std::uint8_t>& data) const = 0;
+    virtual std::uint16_t generateCrc(
+        const std::vector<std::uint8_t>& data) const = 0;
 };
 
 class CrcMock : public CrcInterface