Modernize code

[eumiro]

Issue type

• Enhancement of the code

Summary

• replace OrderedDict with an ordered dict
• refactor the querying
• use f-strings where appropriate

[phibos]

Thanks for all your work. The change will be in the next release. I had to update the required Python version from 3.6.2+ to 3.7+.