Refactor. Playing with reporter