HH-37909 logger refactor, review fixes