Gruntfile refactor