+ minor refactorings