minor refactorings (2)