new class sanitize, refactored continued