WIP: removed jshint errors