moved validation to regexps