Use dict comprehension