Fixed bug

Multiple event listener bug fix
Cleaning up