final small refactorings