Cleaned up some unnecessary code & renamed variables to have better/unde...

...rstandable names