minor tweaks to unsanitized data fix
per Eli's code review comments