rationalize code up through chapter 7
make all subsequent to 3765f4fd9c9c5affec4203dd66915b063f175c6a