Moved validation to separate validator class
First commit
Moved all validation to separate class