lazy validator running + refactoring