REFACTORING: better scoping