Minor PEP8 cleanup

Just cleaning up a few files.  Having fewer files per commit is a better idea.