Add section headers; touchup spacing, indentation