grunt refactoring