Improved Phone Number Matching Code