Cleaning up Chapter 4 (again)