<minor refactoring fiddling>