Sanitize method improvements