Gruntfile.js changes
Some code changes