Cleaning up grunt code