refactoring scoped calls