Cleanup, preparing for python 3