Finished refactoring!