logger cleanup
Making more use of logging