Minor refactoring of SocketFinder utility class