more yaml tidy up
more yaml changes