Refactored to find number regex solution