Various PEP8 edits