more minor refactorings