Some tidying, putting headings etc