Some cleaning up of logs and strings