diff --git a/.clang-format b/.clang-format
index d7e0961..27681a9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -87,7 +87,7 @@
 IndentWrappedFunctionNames: true
 InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-LambdaBodyIndentation: OuterScope
+LambdaBodyIndentation: Signature
 LineEnding: LF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
@@ -98,13 +98,14 @@
 ObjCSpaceBeforeProtocolList: true
 PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 25
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 50
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
+PenaltyIndentedWhitespace: 1
 PointerAlignment: Left
 QualifierAlignment: Left
 ReferenceAlignment: Left
diff --git a/src/asset_info.cpp b/src/asset_info.cpp
index af03fce..8f38d6a 100644
--- a/src/asset_info.cpp
+++ b/src/asset_info.cpp
@@ -13,11 +13,11 @@
 {
 constexpr auto FIRMWARE_TYPE_OFFSET = 0;
 constexpr auto FIRMWARE_TYPE_SIZE = 1;
-constexpr auto FIRMWARE_VERSION_OFFSET = FIRMWARE_TYPE_OFFSET +
-                                         FIRMWARE_TYPE_SIZE;
+constexpr auto FIRMWARE_VERSION_OFFSET =
+    FIRMWARE_TYPE_OFFSET + FIRMWARE_TYPE_SIZE;
 constexpr auto FIRMWARE_VERSION_SIZE = 15;
-constexpr auto FIRMWARE_BUILDTIME_OFFSET = FIRMWARE_VERSION_OFFSET +
-                                           FIRMWARE_VERSION_SIZE;
+constexpr auto FIRMWARE_BUILDTIME_OFFSET =
+    FIRMWARE_VERSION_OFFSET + FIRMWARE_VERSION_SIZE;
 constexpr auto FIRMWARE_BUILDTIME_SIZE = 20;
 constexpr auto FIRMWARE_MIN_SIZE = FIRMWARE_BUILDTIME_OFFSET;
 
@@ -176,11 +176,10 @@
            buildTime.c_str());
 }
 
-ipmi_ret_t ipmiOemIEIAssetInfo(ipmi_netfn_t /* netfn */, ipmi_cmd_t /* cmd */,
-                               ipmi_request_t request,
-                               ipmi_response_t /* response */,
-                               ipmi_data_len_t /* data_len */,
-                               ipmi_context_t /* context */)
+ipmi_ret_t ipmiOemIEIAssetInfo(
+    ipmi_netfn_t /* netfn */, ipmi_cmd_t /* cmd */, ipmi_request_t request,
+    ipmi_response_t /* response */, ipmi_data_len_t /* data_len */,
+    ipmi_context_t /* context */)
 {
     auto header = reinterpret_cast<AssetInfoHeader*>(request);
 
diff --git a/src/firmware_version.cpp b/src/firmware_version.cpp
index fced513..85a28b6 100644
--- a/src/firmware_version.cpp
+++ b/src/firmware_version.cpp
@@ -56,9 +56,8 @@
     BIOS = 0x03,
 };
 
-RspType<std::string> ipmiIEIGetFWVersion(ipmi::Context::ptr ctx,
-                                         uint8_t fwIndex,
-                                         uint8_t /* devIndex */)
+RspType<std::string> ipmiIEIGetFWVersion(
+    ipmi::Context::ptr ctx, uint8_t fwIndex, uint8_t /* devIndex */)
 {
     std::string fwPath{};
     std::string value{};