Refactor!
Prep code for exercise.