Many, but not all, suggested pep8 changes. Unit tests all pass.