default scope refactoring