~ minor refactorings