Fixed the clangformat file. Finished the bonus.