Improve wallet finder fn