Simple pep8 cleanup

Just a simple cleanup of the code. All tests pass and the code should be a little more pep8 compliant.