Reformat address so we don't get ", ," etc
Code cleanup

Tab --> space
More relaxed regex for phone numbers

Was crashing on a differently formatted number