Fix Docstrings in datacollector and clean up general structure