small refactoring, hopefully no functional change