refactoring Yo!