Refactor gulpfile