removed unneeded use of dictionaries to hold a single metric