Refactoring validation.