a few minor refactorings