removed more variables
general clean up