Tidy up
Group validators