Even more PEP8 improvements