change event handlers to return void.