Refactoring of reporter

Hopefully I will create a better commit message (or a better commit?)