Use a dictionary (16/36)

Use a dictionary