Use more-standard yaml format