Finished refactoring for the first time