cleaning up internal firing of event callbacks (make things clearer)