cleaning up some things
changed some variable names, cleaning up