PEP8 and Py3k cleanup