Push prior to refactor

Refactoring straight validation code.