Cleaned up yaml loading