cleanup of some unused variables
renaming