Start working on Refactoring homework