small cleanup
turn on click handling