Refactor yota