Code cleanup from pyflakes analysis.
Merge pull request #3 from ajdawson/pyflakes-modifications

Code cleanup from pyflakes analysis.