Improved sanitization