cleanup, properly parse out hostname/ip for lookups