Report refactor