Making phone number.go better