#465: Refactoring vat validator