Refactored Grunt build