Clean-up of comments.