Refactor ToolTip