some variable changes
clean up