refactoring the context, removing code duplication