Some PEP8 improvements