Relocating grunt code into finish event itself