various small refactorings