integrated yiyus clearurgent refactoring