"Validate" refactor