+ cleanup for Scope.java