13 Commits (fix/clang-format-cleanup)