Small cleanup of lookup search method