diff --git a/.clang-format b/.clang-format
index b89c41fd6..bfa91604a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,57 +1,57 @@
 ---
 Language:                            Cpp
 BasedOnStyle:                        LLVM
 Standard:                            Cpp11
 IndentWidth:                         2
 TabWidth:                            4
 UseTab:                              Never
 ColumnLimit:                         80
-AllowShortBlocksOnASingleLine:       true
-AllowShortIfStatementsOnASingleLine: true
 AccessModifierOffset:                -2
 PointerAlignment:                    Middle
 NamespaceIndentation:                Inner
 ContinuationIndentWidth:             4
 
 # ConstructorInitializerIndentWidth: 4
 # AlignEscapedNewlinesLeft: false
 # AlignTrailingComments: true
 # AllowAllParametersOfDeclarationOnNextLine: true
+# AllowShortBlocksOnASingleLine:       false
+# AllowShortIfStatementsOnASingleLine: false
 # AllowShortLoopsOnASingleLine: false
 # AllowShortFunctionsOnASingleLine: All
 # AlwaysBreakTemplateDeclarations: false
 # AlwaysBreakBeforeMultilineStrings: false
 # BreakBeforeBinaryOperators: false
 # BreakBeforeTernaryOperators: true
 # BreakConstructorInitializersBeforeComma: false
 # BinPackParameters: true
 # ConstructorInitializerAllOnOneLineOrOnePerLine: false
 # DerivePointerAlignment: false
 # ExperimentalAutoDetectBinPacking: false
 # IndentCaseLabels: false
 # IndentWrappedFunctionNames: false
 # IndentFunctionDeclarationAfterType: false
 # MaxEmptyLinesToKeep: 1
 # KeepEmptyLinesAtTheStartOfBlocks: true
 # ObjCSpaceAfterProperty: false
 # ObjCSpaceBeforeProtocolList: true
 # PenaltyBreakBeforeFirstCallParameter: 19
 # PenaltyBreakComment: 300
 # PenaltyBreakString: 1000
 # PenaltyBreakFirstLessLess: 120
 # PenaltyExcessCharacter: 1000000
 # PenaltyReturnTypeOnItsOwnLine: 60
 # SpacesBeforeTrailingComments: 1
 # Cpp11BracedListStyle: true
 # BreakBeforeBraces: Attach
 # SpacesInParentheses: false
 # SpacesInAngles:  false
 # SpaceInEmptyParentheses: false
 # SpacesInCStyleCastParentheses: false
 # SpacesInContainerLiterals: true
 # SpaceBeforeAssignmentOperators: true
 # CommentPragmas:  '^ IWYU pragma:'
 # ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 # SpaceBeforeParens: ControlStatements
 # DisableFormat:   false
 ...