clean up

mostly renaming variables