Refactor gruntfile