Address cr comments in context.py
Address cr comments in context.py

Workiva/furious,mattsanders-wf/furious,andreleblanc-wf/furious,mattsanders-wf/furious,Workiva/furious,rosshendrickson-wf/furious,beaulyddon-wf/furious,andreleblanc-wf/furious,rosshendrickson-wf/furious,beaulyddon-wf/furious