From Singleton to DI; Refactoring; Cleanup