Tidying up and edit pass 1