Redid some of the auto-generated comments