cleanup
use new addEvent function to bind events (see d31c9d807cb58f403ac427b05ad6fc6dc4deab3f)