use PmidName as Key in PmidManager + minor clean up