Cleaning up Chapter 1.