slight comment/naming tweaks