improve logging, no functional changes