Tidy up phone_numbers.go