added better sanitization