Refactor - make context creation explicit, rename.