diff --git a/.clang-format b/.clang-format
index a75a2c2..e5530e6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -104,7 +104,7 @@
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyReturnTypeOnItsOwnLine: 150
 PenaltyIndentedWhitespace: 1
 PointerAlignment: Left
 QualifierAlignment: Left
diff --git a/inc/button_factory.hpp b/inc/button_factory.hpp
index 2b7c9b9..26a1831 100644
--- a/inc/button_factory.hpp
+++ b/inc/button_factory.hpp
@@ -60,9 +60,9 @@
      * @brief this method returns the button interface object
      *    corresponding to the button formfactor name provided
      */
-    std::unique_ptr<ButtonIface>
-        createInstance(const std::string& name, sdbusplus::bus_t& bus,
-                       EventPtr& event, ButtonConfig& buttonCfg)
+    std::unique_ptr<ButtonIface> createInstance(
+        const std::string& name, sdbusplus::bus_t& bus, EventPtr& event,
+        ButtonConfig& buttonCfg)
     {
         // find matching name in the registry and call factory method.
         auto objectIter = buttonIfaceRegistry.find(name);
diff --git a/src/power_button.cpp b/src/power_button.cpp
index 879c659..dee931f 100644
--- a/src/power_button.cpp
+++ b/src/power_button.cpp
@@ -19,8 +19,8 @@
 #include "button_handler.hpp"
 
 // add the button iface class to registry
-static ButtonIFRegister<PowerButton>
-    multiButtonRegister(phosphor::button::numberOfChassis());
+static ButtonIFRegister<PowerButton> multiButtonRegister(
+    phosphor::button::numberOfChassis());
 
 void PowerButton::simPress()
 {