Tooltip string updates / simplifications