Fixed numerous jshint and ES6 import errors