Clean up yaml file format