Refactor reporting
Don't need this