pep8 cleanup.

Since you are okay with the cleanup let me submit more to you.