Refactor for simple use

Prior to this commit we could not successfully call with just two hostnames
This commit fixes the code path for this to happen