Better number extract