ToolTip refactor