Clean up sumo

Merge if you like ... I may keep adding more commits to clean things out. Eager to see the effect on our code coverage.