Tidy up validation