Fix CR comments - use right singlton pattern