Address some style/logging issues from Igor47