Further tidying of HTML