minor renaming
cleanup