A little bit of docs and code cleanup
Switch to use a named instance manager (a.k.a. Multiton pattern)