Simplify context manager