Refactoring data validation library being used