Various linting with pyflakes.
Merge pull request #40 from bukzor/clean_up

Various linting with pyflakes.