Refactored gruntfile