A bit of PEP8 cleanup