minor event handler namespace cleanup