Better sanitization and better spec