Code refactor using PEP8
Fixed wrong indentation in collector module

Yeah, it's this big command, again :D
Merge pull request #38 from miniche/feature-pep8

Code refactor using PEP8