working on better sanitization