Update standard for transition to YAML and general simplification