Hover management and refactoring