Refactored Grunt tasks