Refactoring tooltip plugin again