Some PEP8 fixes