Fix a comment and reformat clang-format with clang-format

Not all changes might be ideal, but IMO all are acceptable.