Cleaning up Chapter 2
Merged