Refactoring execution context