refactored Yaml