Cleanup and fix yaml load