Refactor Gulpfile

see below