Cleaned validator an EventListener