- Refactor class