Refactoring the gulpfile