More tidying up of the document