Singleton improvements and readability fix