diff --git a/.clang-format b/.clang-format
index d43e884..28e3328 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/snmp_conf_manager.cpp b/snmp_conf_manager.cpp
index 1155ee5..dab7317 100644
--- a/snmp_conf_manager.cpp
+++ b/snmp_conf_manager.cpp
@@ -140,8 +140,8 @@
 
         fs::path objPath = objectPath;
         objPath /= managerID;
-        auto manager = std::make_unique<Client>(bus, objPath.string().c_str(),
-                                                *this);
+        auto manager =
+            std::make_unique<Client>(bus, objPath.string().c_str(), *this);
         if (deserialize(confFile.path(), *manager))
         {
             manager->emit_object_added();
diff --git a/snmp_notification.hpp b/snmp_notification.hpp
index 7477895..3a38c9d 100644
--- a/snmp_notification.hpp
+++ b/snmp_notification.hpp
@@ -174,8 +174,8 @@
      */
     OBMCErrorNotification(uint32_t id, uint64_t ts, int32_t sev,
                           std::string msg) :
-        OBMCErrorID(id),
-        OBMCErrorTimestamp(ts), OBMCErrorSeverity(sev), OBMCErrorMessage(msg)
+        OBMCErrorID(id), OBMCErrorTimestamp(ts), OBMCErrorSeverity(sev),
+        OBMCErrorMessage(msg)
     {}
 
   protected: