Reduce scope dependencies in scope functions