Additional Chapter 2 clean up.