Refactor reporter (more than x4 speed up)