refactor to reduce complexity
use correct validator name