tidied validator
tidied up