refactored gulpfile