Merge "clang-format the rest of the files"