Refactored tooltip