Some chapter 2 cleanup