Refactor section content statements