Refacto data collector
Merge pull request #11 from ludofleury/refacto

Refacto data collector