U/brent/update

final(?) refactoring for xml validator