08252013 Homework Refactoring