Refactor Grunt Task