Grunt refactorings