Improve sanitizer.