Clang-format cleanup