Minor logging cleanup
Merge pull request #673 from pveentjer/improvement/3.x/logging-cleanup

Improvement/3.x/logging cleanup