Switched return type to OrderedDict. Cleaned up comments