diff --git a/fw-update/activation.cpp b/fw-update/activation.cpp
index d39cf9f..abafd96 100644
--- a/fw-update/activation.cpp
+++ b/fw-update/activation.cpp
@@ -7,8 +7,8 @@
 namespace fw_update
 {
 
-ActivationIntf::Activations
-    Activation::activation(ActivationIntf::Activations value)
+ActivationIntf::Activations Activation::activation(
+    ActivationIntf::Activations value)
 {
     if (value == ActivationIntf::Activations::Activating)
     {
diff --git a/fw-update/activation.hpp b/fw-update/activation.hpp
index 4af7c44..f072124 100644
--- a/fw-update/activation.hpp
+++ b/fw-update/activation.hpp
@@ -105,8 +105,8 @@
 
     /** @brief Overriding RequestedActivations property setter function
      */
-    RequestedActivations
-        requestedActivation(RequestedActivations value) override
+    RequestedActivations requestedActivation(
+        RequestedActivations value) override
     {
         if ((value == RequestedActivations::Active) &&
             (requestedActivation() != RequestedActivations::Active))
diff --git a/fw-update/update_manager.hpp b/fw-update/update_manager.hpp
index 61db3e7..c24af61 100644
--- a/fw-update/update_manager.hpp
+++ b/fw-update/update_manager.hpp
@@ -83,10 +83,10 @@
     /** @brief
      *
      */
-    DeviceUpdaterInfos
-        associatePkgToDevices(const FirmwareDeviceIDRecords& fwDeviceIDRecords,
-                              const DescriptorMap& descriptorMap,
-                              TotalComponentUpdates& totalNumComponentUpdates);
+    DeviceUpdaterInfos associatePkgToDevices(
+        const FirmwareDeviceIDRecords& fwDeviceIDRecords,
+        const DescriptorMap& descriptorMap,
+        TotalComponentUpdates& totalNumComponentUpdates);
 
     const std::string swRootPath{"/xyz/openbmc_project/software/"};
     Event& event; //!< reference to PLDM daemon's main event loop