more tooltip cleanup