Better yaml

Refactored all the codez.