Combine before_validation methods into one

* Use one before_validation method and call out of that