Sanitize, improve security