diff --git a/.clang-format b/.clang-format
index 39847e171..54d0ff1ce 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,10 +1,11 @@
 ---
 AlignAfterOpenBracket: 'Align'
 AlignConsecutiveAssignments: 'false'
-AlignConsecutiveDeclarations: 'true'
+AlignConsecutiveDeclarations: 'false'
 AlignConsecutiveMacros: 'true'
 AlignOperands: 'true'
 AlignTrailingComments: 'true'
+AllowAllArgumentsOnNextLine: 'false'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
 AllowShortBlocksOnASingleLine: 'false'
 AllowShortCaseLabelsOnASingleLine: 'false'
@@ -12,7 +13,7 @@ AllowShortFunctionsOnASingleLine: 'Inline'
 AllowShortIfStatementsOnASingleLine: 'false'
 AlwaysBreakAfterReturnType: 'All'
 BinPackParameters: 'false'
-BinPackArguments: 'true'
+BinPackArguments: 'false'
 BreakBeforeBraces: 'Linux'
 DerivePointerAlignment: 'false'
 IndentCaseLabels: 'false'
@@ -32,8 +33,6 @@ TabWidth: '8'
 UseTab: 'Always'
 
 PenaltyBreakAssignment: '3'
-PenaltyBreakString: '10'
-PenaltyExcessCharacter: '1'
 PenaltyBreakBeforeFirstCallParameter: '15'
 
 IncludeCategories: