diff --git a/.clang-format b/.clang-format
index d0ef16a775e2042e15569ccd72e80ce8957d12bb..b9adbf55848311365da9464ec060dbe9ba40716c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -25,7 +25,7 @@ BinPackParameters: false
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Attach
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: AfterColon
+BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: AfterColon
 ColumnLimit: 80
 CompactNamespaces: false
@@ -50,7 +50,7 @@ ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
 PenaltyBreakAssignment: 2
 PointerAlignment: Left
-ReflowComments: true
+ReflowComments: false
 SortIncludes: true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
diff --git a/scripts/apply-format.sh b/scripts/apply-format.sh
new file mode 100755
index 0000000000000000000000000000000000000000..dc8e0c8e9924f85adc79eb708d738d68eb71513f
--- /dev/null
+++ b/scripts/apply-format.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+CLANG_FORMAT_BIN=${FAIRROOT_CLANG_FORMAT_BIN:-clang-format}
+
+FILES=$(find . -type f \
+        \( -iname "*.h" -o -iname "*.hpp" -o -iname "*.cxx" -o -iname "*.cpp" -o -iname "*.c" -o -iname "*.C" \) \
+        -not \( -path "./build/*" -o -path "./cmake/*" -o -path "./external/*" -o -path "./geometry/*" -o -path "./parameters/*" -o -path "./input/*" -prune \))
+
+$CLANG_FORMAT_BIN -i $FILES --verbose