Some more PEP8