Improve Server-finding code