#5197 Cleaned up ReportingClient for easier use