refactored yo