Refactor section helpers