Refactored Report controller.