code cleanup with pyflakes
Merge pull request #45 from hallaj/2.0

code cleanup with pyflakes