refactoring context handling