Fixes clang-format changes
Auto style fixer
Merge branch 'clang-format-fixer' into clang-format