change validator to be a static class
added Clean to validator