Refactored Grunt