Further refactoring of the gulpfile