Refactoring, fixed validators