Refactor Gruntfile