Cleanup Chap 02: adds more exercises