Clean up use of logging module to better follow best-practice