Clean up of comments