Replaced dict.whatever calls with super(OrderedDict, self)
pylint and code cleanup