diff --git a/src/mctp/MCTPDeviceRepository.hpp b/src/mctp/MCTPDeviceRepository.hpp
index 6602ea7..ca67547 100644
--- a/src/mctp/MCTPDeviceRepository.hpp
+++ b/src/mctp/MCTPDeviceRepository.hpp
@@ -62,8 +62,8 @@
         return lookup(device) != devices.end();
     }
 
-    std::optional<std::string>
-        inventoryFor(const std::shared_ptr<MCTPDevice>& device)
+    std::optional<std::string> inventoryFor(
+        const std::shared_ptr<MCTPDevice>& device)
     {
         auto entry = lookup(device);
         if (entry == devices.end())
diff --git a/src/mctp/MCTPEndpoint.cpp b/src/mctp/MCTPEndpoint.cpp
index 870e708..5eb114e 100644
--- a/src/mctp/MCTPEndpoint.cpp
+++ b/src/mctp/MCTPEndpoint.cpp
@@ -318,8 +318,8 @@
     return dev;
 }
 
-std::optional<SensorBaseConfigMap>
-    I2CMCTPDDevice::match(const SensorData& config)
+std::optional<SensorBaseConfigMap> I2CMCTPDDevice::match(
+    const SensorData& config)
 {
     auto iface = config.find(configInterfaceName(configType));
     if (iface == config.end())
diff --git a/src/mctp/MCTPEndpoint.hpp b/src/mctp/MCTPEndpoint.hpp
index 9205eb1..ffba380 100644
--- a/src/mctp/MCTPEndpoint.hpp
+++ b/src/mctp/MCTPEndpoint.hpp
@@ -163,10 +163,10 @@
      *              the request was successful then @p ep contains a
      *              valid MctpEndpoint instance.
      */
-    virtual void
-        setup(std::function<void(const std::error_code& ec,
-                                 const std::shared_ptr<MCTPEndpoint>& ep)>&&
-                  added) = 0;
+    virtual void setup(
+        std::function<void(const std::error_code& ec,
+                           const std::shared_ptr<MCTPEndpoint>& ep)>&&
+            added) = 0;
 
     /**
      * @brief Remove the device and any associated endpoint from the MCTP stack.
@@ -309,9 +309,9 @@
   public:
     static std::optional<SensorBaseConfigMap> match(const SensorData& config);
     static bool match(const std::set<std::string>& interfaces);
-    static std::shared_ptr<I2CMCTPDDevice>
-        from(const std::shared_ptr<sdbusplus::asio::connection>& connection,
-             const SensorBaseConfigMap& iface);
+    static std::shared_ptr<I2CMCTPDDevice> from(
+        const std::shared_ptr<sdbusplus::asio::connection>& connection,
+        const SensorBaseConfigMap& iface);
 
     I2CMCTPDDevice() = delete;
     I2CMCTPDDevice(