Tooltip fix and clean