MIN Remove Python2isms

Still not completely Python 3 compatible, but closer