Reorder and condense sections.