A little more PEP8-ifying