small refactorings #10547

Closed rymsha closed 4 months ago