Refactor Sections, doing adjustments for sections