Cleanup: remove unused imports
Cleanup: make field immutable
Cleanup: use interfaces for loose coupling