Cleaning up parts of Chapter 3