Finished gulp refactor