PEP370 compatibility
Cleanups