- Refactor into one class