refactore code + gulp