Hover management and refactoring

Allows better understanding of the structure