Added comment
Switched to traditional singleton `.instance` static getter rather than factory.
Review fixes & nits