diff --git a/libpldmresponder/bios_config.cpp b/libpldmresponder/bios_config.cpp
index e4b10c8..aea24a0 100644
--- a/libpldmresponder/bios_config.cpp
+++ b/libpldmresponder/bios_config.cpp
@@ -867,10 +867,9 @@
 
         BIOSStringTable biosStringTable(*stringTable);
         auto attrName = biosStringTable.findString(attrHeader.stringHandle);
-        auto iter = std::find_if(biosAttributes.begin(), biosAttributes.end(),
-                                 [&attrName](const auto& attr) {
-            return attr->name == attrName;
-        });
+        auto iter = std::find_if(
+            biosAttributes.begin(), biosAttributes.end(),
+            [&attrName](const auto& attr) { return attr->name == attrName; });
 
         if (iter == biosAttributes.end())
         {
@@ -1115,7 +1114,7 @@
         PendingAttributes pendingAttributes =
             std::get<PendingAttributes>(valPropMap->second);
         this->constructPendingAttribute(pendingAttributes);
-        });
+    });
 
     biosAttrMatch.emplace_back(std::move(updateBIOSMatch));
 }
