Remove unneeded veriables
Whitespace

Forgot the tests
Merge pull request #5 from joelkuiper/develop

Develop