Homework from refactoring lesson.