Cleanup of chapter 1 complete-ish.