Update to the new comment styles