pep8 fixes.

Fix pep8 warnings in files touched by my last commit.

@JonahStanley please review. Note that variable names cannot be a single letter. Unused variables should start with an underscore.