A bit of clean-up on chapter 5