pep8 compliance and cleanup

There were a few instances of extra lines, or not enough lines, whitespace in the wrong places. All modules now pass pep8 tests.