Chapter 3 cleanup
Chapter 4 cleanup