Basic clean up of Chapter 3