- Slight refactor