Make jshint happy

Cleaned up indentation, removed unused variables. Now jshint is happy! And the tests still pass!