Fixed pep8 errors
Killed a zombie
pep8 all the way!

(Removed all double-hash comments, that seems to be forbidden now..)