Tidying up the HTML