Finishing reworking Gulpfile