validators refactoring. testing needed