small refactorings.