Changed event listeners to use event streams for attaching.
Made methods private.