Restructuring for grunt