Switching dicts to ordered dicts