Improvement for number validations