cleaned out comments, ChangeNames renamed