Finished refactoring entire project