clean-up of comments