Clean-up of comments