Tidying up gulpfile