Since regular dicts are ordered in 3.7, it might be cleaner to returning regular dict instead of OrderedDict?