[enhancement] Refactoring