Some PEP8 style fixes