more minor organization: factor out chapter 1