Singleton refactor