Tidy up phone_number