clean up logging calls somewhat