Made YAML string literals and removed hyphens