Changed certain OrderedDicts to Dict to better management