[Yi]Refactoring