Rename context var in a few places and other minor polish
Rename context var in a few places and other minor polish

liljencrantz/anna,liljencrantz/anna,liljencrantz/anna,liljencrantz/anna,liljencrantz/anna