Better number extractor