Enhacements in gruntfile