(Some) more PEP8...