Minor cleanup of Lookup API