Fix jshint and adjusting