Removing spaces

Done with this one  :)
Unused variables commented out

And a few spaces removing