small other refactorings