cleaned up validation to for