Some Cleanup of Chapter 2