minor refactoring / code review
Merge branch 'gtch-clean-main'
Moved newNotificationQueue to Environment to avoid using reflection