Updated to run without 2to3