Refactor Reports