Refactoring homework added