Fixing jshint and checkstyle issues