factory locator comes from mailbox, not factory
minor cleanup