Cleanup, Python 3 support