PEP8
Remove commented pdb
Merge pull request #128 from affinitic/master

PEP8 and cleanup