Tidying up the validators