Cleanup the validate method on the Contract class