Tons of cleanup via jshint