Improve gruntfile.js and package.json