[REFACTOR] Refactored