Clean up the lookup code