cosmetics: small refactorings