clang-format: second pass