Improve on Events Listener