Split validation out of run