cleaning up logging around events