refactoring more sections