more refactors to gulp