Refactoring for sections