[Fix] Refactoring