diff --git a/.clang-format b/.clang-format
index 26dde7e4..89e5b902 100644
--- a/.clang-format
+++ b/.clang-format
@@ -45,7 +45,7 @@ BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     140
 CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: true
+CompactNamespaces:  false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
diff --git a/format.sh b/format.sh
index 6c61c628..51b987e4 100755
--- a/format.sh
+++ b/format.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-find . -name "*\.h" -o -name "*\.cpp"|xargs dos2unix
-find . -name "*\.h" -o -name "*\.cpp"|xargs clang-format -i
+echo -n "Running dos2unix "
+find . -name "*\.h" -o -name "*\.cpp"|xargs -I {} sh -c "dos2unix '{}' 2>/dev/null; echo -n '.'"
+echo
+echo -n "Running clang-format "
+find . -name "*\.h" -o -name "*\.cpp"|xargs -I {} sh -c "clang-format -i {}; echo -n '.'"
+echo