Section 2 cleaned up