Refactored Gruntfile