Some PEP8 adjustments