Clean up
Merge pull request #1 from Lunanne/PEP8

Pep8