More clang-format