Some PEP8 edits