Sanitize log entries

Addresses TODO on issue #652