various refactorings as the book comes to a close. Mostly from copying and formatting code for the book