Pep8 from flake
More PEP8
Final PEP8
Remove unused code blocks
Merge pull request #35 from dotKom/pep8

Some PEP8 improvements