Better way of removing lists around headings