Cleanup of comments