diff --git a/.clang-format b/.clang-format
index ef4261c8..6b47c3fc 100644
--- a/.clang-format
+++ b/.clang-format
@@ -25,12 +25,12 @@ AccessModifierOffset: -2
 # AlwaysBreakTemplateDeclarations: Yes
 # BinPackArguments: true
 # BinPackParameters: true
-# BraceWrapping:
+BraceWrapping:
 #   AfterCaseLabel:  false
 #   AfterClass:      false
 #   AfterControlStatement: false
 #   AfterEnum:       false
-#   AfterFunction:   false
+  AfterFunction:   true
 #   AfterNamespace:  false
 #   AfterObjCDeclaration: false
 #   AfterStruct:     false
@@ -44,9 +44,9 @@ AccessModifierOffset: -2
 #   SplitEmptyNamespace: true
 # BreakAfterJavaFieldAnnotations: false
 # BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Stroustrup
+BreakBeforeBraces: Custom
 # BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: false
+# BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
 BreakConstructorInitializersBeforeComma: true
 BreakInheritanceList: AfterColon
@@ -93,7 +93,7 @@ IncludeCategories:
 # MacroBlockBegin: ''
 # MacroBlockEnd:   ''
 # MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
+# NamespaceIndentation: None
 # ObjCBinPackProtocolList: Never
 # ObjCBlockIndentWidth: 2
 # ObjCSpaceAfterProperty: false
@@ -143,9 +143,9 @@ NamespaceIndentation: All
 SpaceAfterTemplateKeyword: false
 # SpaceBeforeAssignmentOperators: true
 # SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: false
+# SpaceBeforeCtorInitializerColon: true
 # SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: Never
+# SpaceBeforeParens: ControlStatements
 # SpaceBeforeRangeBasedForLoopColon: true
 # SpaceInEmptyBlock: false
 # SpaceInEmptyParentheses: false