refactor
UriValidator enhancement