Fix spacing and add mouseEventData to handler params