Fix validation bug
Refactoring