PEP8
Python 3 fixes