clean up logging more