Refactor sections.