cleaning up some whitespace, fixing some variables