PEP8-ify a bit