Refactor yoall.