Format order changed from Groovy for yaml.

Updated the ordering for consistency.