Chapter 4 clean up