comments, made names simpler