Style fixes, brought to you by clang-format