diff --git a/.clang-format b/.clang-format
index 5df61b0661..6536f034e3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
 Standard: Cpp11
-UseTab: Always
+UseTab: ForIndentation
 TabWidth: 1
 IndentWidth: 1 
 AccessModifierOffset: -1
@@ -7,7 +7,7 @@ PointerAlignment: Left
 NamespaceIndentation: All
 ColumnLimit: 0
 BreakBeforeBraces: Allman
-BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializersBeforeComma: true
 BreakBeforeBinaryOperators: false
 BreakBeforeTernaryOperators: false
 AlwaysBreakTemplateDeclarations: true
@@ -20,7 +20,7 @@ Cpp11BracedListStyle: true
 IndentCaseLabels: false
 SortIncludes: false
 ReflowComments: true
-AlignConsecutiveAssignments: false
+AlignConsecutiveAssignments: true
 AlignTrailingComments: true
 AlignAfterOpenBracket: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false