Tidied up Validation classes