Refactored validate() method on model