Additional changes to .clang-format