Wrap most computation into "compute_tax_year" in preparation for comparing multiple years.  Removed plots of intermediate results