minor reworking, sanitize done