simplify code now that scoped wrapper is no longer necessary