Committing Exercise 13, code cleanup.
Committing Exercise 13, code cleanup.