cleaned up more logging