Grunt refactor