Python 3 Compatibility Cleanup