Jshint based cleanups
Jshint based cleanups