Cleanup ex2 to match book