Work related to Python 2 review