Cleaning up the YAML examples