tidy up repeated validation