DRYing up validation code
Refactor Pact contracts