Refactored grunt process