Singleton improved and cleaned up