tidy up of comments