PEP8 + Clean

Your file was hard to read. It has been pep8'ed now.
Merge pull request #1 from ikkebr/patch-1

PEP8 + Clean