Code clean up.
Committing exercise 3.5 part 2.