Refactor of sections.