- Refactored code.