Removed unused imports
Used interface instead of implementation to allow for testing
Injected connection service to allow for testing
Removed unused argument