More nitpicking in chapters 0-6
Simplify some code in chapter 6