Refactored tool tips