Improve clang-format