more sanitization refactoring, probably makes it own class