Refactor reports