CLC-4410 Tweak logging, comments