Chapter 2 question 2.5 and cleanup.
Chapter 2 question 2.5 and cleanup.