Review fixes
clang-format