minor refac to prepare for additional reporter.