~ small refactorings