Some PEP8 compliance