A bit of PEP8 clean up