Hover/Leave refactoring