got rid of dict comprehension