Fixes tests
 Cleanup
 Cleaning up Infernals
Formatting, reducing number of Yozi friends
Cleanup
Formatting
Trying to un-trait the yozi selection
Reduces duplication
* Eliminates Visitor for favorable state
Working towards yozi presentation without traits