Another PEP8 iteration