Improve JS (jshint says hi)