diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.cpp b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
index 2bbb5af..c329bac 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
@@ -103,8 +103,8 @@
 
     try
     {
-        auto service =
-            pldm::utils::DBusHandler().getService(logObjPath, logInterface);
+        auto service = pldm::utils::DBusHandler().getService(logObjPath,
+                                                             logInterface);
         auto method = bus.new_method_call(service.c_str(), logObjPath,
                                           logInterface, "GetPEL");
         method.append(fileHandle);
@@ -134,8 +134,8 @@
 
     try
     {
-        auto service =
-            pldm::utils::DBusHandler().getService(logObjPath, logInterface);
+        auto service = pldm::utils::DBusHandler().getService(logObjPath,
+                                                             logInterface);
         auto method = bus.new_method_call(service.c_str(), logObjPath,
                                           logInterface, "GetPEL");
         method.append(fileHandle);
@@ -224,8 +224,8 @@
 
     try
     {
-        auto service =
-            pldm::utils::DBusHandler().getService(logObjPath, logInterface);
+        auto service = pldm::utils::DBusHandler().getService(logObjPath,
+                                                             logInterface);
         auto method = bus.new_method_call(service.c_str(), logObjPath,
                                           logInterface, "HostAck");
         method.append(fileHandle);
@@ -251,8 +251,8 @@
 
     try
     {
-        auto service =
-            pldm::utils::DBusHandler().getService(logObjPath, logInterface);
+        auto service = pldm::utils::DBusHandler().getService(logObjPath,
+                                                             logInterface);
         using namespace sdbusplus::xyz::openbmc_project::Logging::server;
         std::map<std::string, std::string> addlData{};
         auto severity =
