tidying up of some markup