Refactoring: Singleton in progress