cleanup, jshint, all tests pass