bit of cleanup and nomenclature changes