- Refactored to manageable size