Improved data sanitization