Some PEP8 rework