clang-formatting
more clang formatting