more Grunt refactoring