GK: refactoring grunt