Minor cleanup. Chapter 5 code complete.