Refactoring Report generation (wip)