Kjq/cleanup -- clean up everything so it passes jshint cleanly and all tests

No functionality change, just formatting.