small cleanup of comments for CR