Some PEP8 clean up