Refactoring of the gruntfile