Refactor report maker