Tweak # queued tooltip, refactor
Reformat code