clean up chapter 1 and 2