Remove unneeded veriables
Whitespace

Forgot the tests