[REFACTORING] Change event handling for leap's listener