Refactor sections