Added Section 3.2 and started code cleanup