Refactor to support Python 2.6.x