Refactor - focus follows the mouse
Refactor - remove warnings