Better use of dictionaries.