Refactor invoice report.