More yo refactoring