[format] Cleanup various PRs not run through clang-format
Merge pull request #344 from theopolis/format-cleanup

[format] Cleanup various PRs not run through clang-format