continued gulp refactor