Support non-gulp tasks, Refactor