Fix formatting up to Section 8