Improve gulp tasks