Homework Refactoring