Refactoring and basic Validator model