Format tidying, headings etc
Minor extra tidying