refactoring homework 30% done