Refactored gulpfile