finished chapter 2 cleanup