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