Yarn refactor