refactor yo