Some PEP8 conforming