Fixing format issues with clang-format