Cleanup
working fine
Pyflaked
Merge pull request #2 from Pithikos/master

Pyflaked and clean!