Improvements in Gruntfile