Re-factor Gruntfile