Refactoring Home Work