Use a dictionary (18/36)

Use a dictionary