Moving Away from Python 2