clean up validation a bit