Some PEP8 modifications