- Refactored extract methods