Finished refactoring everything to new style guide