Quick cleanup

Removed various trailing whitespace, and the sinon module that wasn't being used for testing.