Little cleanup on Chapter 2