more cleanup

remove redundant reference passing