Cleanup Python 3 compatibility