Change the way we handle sanitization

Signed-off-by: Suki <suki@missallsunday.com>
Also add this to validate()

Signed-off-by: Suki <suki@missallsunday.com>