Small cleanup to logging