Yaml markup cleaned-up