Refactored section and sub-section headings