Improve YAML file