Refactoring on tool-tip