remove excess cruft
function naming adjustments