Fixing for Dependency Injection
Removing unnecessary logic
Removing dependencies
Reworking declared winner logic
Reducing dependencies in tests