starting some cleanup of chapter 2. ouch this is bad.