Tidy up in .yml