clean up of comments