diff --git a/.clang-format b/.clang-format
index c84154ce..69575235 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,6 +2,10 @@ BasedOnStyle: Google
 ColumnLimit: 120
 IndentWidth: 4
 
+DerivePointerAlignment: false
+PointerAlignment: Left
+ReferenceAlignment: Left
+
 # This will make access modifiers (public/protected/private) sit on the same indentation as `class` keyword
 AccessModifierOffset: -4
 
@@ -15,12 +19,16 @@ AlignAfterOpenBracket: AlwaysBreak
 BinPackArguments: false
 BinPackParameters: false
 
-# When constructor initializers exist in the constructor definition, leave the colon as last thing on the original
-# line instead of putting it on the next line.
-BreakConstructorInitializers: AfterColon
 
 # Disallow single statements after if/else/for/while/do without curly braces.
 InsertBraces: true
 
 # Separate definition blocks, including classes, structs, enums, and functions.
 SeparateDefinitionBlocks: Always
+
+# Line up : and , in ctor init list
+AllowShortFunctionsOnASingleLine: false
+BreakConstructorInitializers: BeforeComma
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+
+InsertNewlineAtEOF: true