Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Kirk Swenson <f94024db5273851678a8b3fa54202122f2521897@users.noreply.github.com>
concord-consortium/portal-report,concord-consortium/portal-report,concord-consortium/portal-report,concord-consortium/portal-report