refactor yto