[REF] Refactoring