all gulp; refactor