Grunt refactoring