Refactor the ValidationService