some changes as per 2to3