improving validations