Refactored to use new url_validator class

Signed-off-by: Cory Leistikow <cory.leistikow@gmail.com>