sections refactoring