Refactor

Refactor so that the Custom Validatator doesn't need to have a
non-default constructor any more.