yaml: some formatting/cleanup.