NOREF:Changing the structure of the YAML file just a little to make it easier to understand