Refactor the ValidationService

No match.