[Refactoring] success