Improved single code base support for Python 2 and 3