Slight cleanup.
Merge branch 'challenge-1-solution' into challenge-2-solution