Nax authored Sep 24, 2018 and klafyvel committed Oct 06, 2018

Automatic clean up that checks Python 2.7 compatibility, switch some
methods to static and rearrange code.