Moving sanitizes into update functions