More (pythonic) logging-related changes