Cleaning up YAML syntax