diff --git a/.clang-format b/.clang-format
index 5345366d..af33ee77 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,28 +1,30 @@
+# Format Style Options - Created with Clang Power Tools
 ---
-BasedOnStyle: LLVM
 AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: AcrossComments
 AlignEscapedNewlines: Left
-AllowAllArgumentsOnNextLine: 'false'
-AllowShortBlocksOnASingleLine: 'false'
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: false
+AllowShortBlocksOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
-BinPackArguments: 'false'
-BinPackParameters: 'false'
+BasedOnStyle: LLVM
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Allman
 BreakConstructorInitializers: AfterColon
-ColumnLimit: '120'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-ConstructorInitializerIndentWidth: '2'
-ContinuationIndentWidth: '2'
-MaxEmptyLinesToKeep: '1'
+ColumnLimit: 120
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth : 2
+ContinuationIndentWidth: 2
+MaxEmptyLinesToKeep: 1
 PointerAlignment: Middle
-SortIncludes: 'false'
-SortUsingDeclarations: 'false'
+SortIncludes: false
+SortUsingDeclarations: false
 SpaceBeforeParens: Never
-SpacesInAngles: 'true'
-SpacesInParentheses: 'true'
-SpacesInSquareBrackets: 'true'
+SpacesInAngles: true
+SpacesInParentheses: true
+SpacesInSquareBrackets: true
 UseTab: Never
-AlignConsecutiveAssignments: AcrossComments
-
 ...