Add: exctract the mouse listener inside a class