little more clean up on tooltips
more clean up and generalization to the tooltip