Refactor report structure