Change clang-format option and cleanup the code

Change-Id: I4157601771370962c3231a1f85185d50667d0d4a
diff --git a/.clang-format b/.clang-format
index 5c14162..f9b078b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -18,4 +18,5 @@
 AlignAfterOpenBracket: Align
 BinPackArguments: false
 BinPackParameters: false
+SpaceBeforeCpp11BracedList: false
 ...