Cleaned up yaml