Updated and refactor + reword validator class