+validator instrument
+bit of refactoring