Cleanup of variant grading to support annotation of grading results on each variant