Some PEP8 applied