Try to tidy up the yaml formatting a bit