Continue overhaul. Converted a few OrderedDict when not needed. Last cleanup: mlbinjury