Extract reporting functions into new class