Ok, I can refactor that. I assume you're ok with the Hostext::Search? We'll need search later on for the filtering of discovered hosts.