clean up yaml
I think I have some solid ideas