Cleanup. Added stopPropagation