Update to Python 3
PEP8 formatting changes