Refactor headings