Minor changes to Lookup for better readability