Refactoring grunt