Fixed some formatting issues with clang-format to get a baseline.