[REFACTOR] Refactoring