Some PEP8-y fixes