Refactor validations to create methods